From: Robby K <robbyke@gmail.com>
Date: Tue, 28 Apr 2020 07:54:24 +0000 (+0200)
Subject: freeradius3: Removed patches/004-fix-target-python-header-detection.patch as it is... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=71bea36878a9df8769883c32d24673f81f11ec0e;p=feed%2Fpackages.git

freeradius3: Removed patches/004-fix-target-python-header-detection.patch as it is no longer needed for the freeradius3-mod-python3 package to compile and updated the Makefile to reflect this due to the following change/commit in freeradius:
https://github.com/FreeRADIUS/freeradius-server/commit/307678b268cf8898a65632147ecc40d37ea3f9d3

This is in preparation for the 3.0.21 update.

Signed-off-by: Robby K <robbyke@gmail.com>
---

diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
index 6f1c92990f..37292558b6 100644
--- a/net/freeradius3/Makefile
+++ b/net/freeradius3/Makefile
@@ -589,11 +589,7 @@ ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius3-mod-python3),)
   CFLAGS+= -fPIC
   CONFIGURE_ARGS+= \
 		--with-modules="rlm_python3" \
-		--with-rlm-python3-include-dir="$(PYTHON3_INC_DIR)" \
-		--with-rlm-python3-lib-dir="$(PYTHON3_LIB_DIR)"
-  CONFIGURE_VARS+= \
-		OPENWRTTARGET_PY3_PREFIX="$(PYTHON3_DIR)" \
-		OPENWRTTARGET_PY3_SYS_VERSION="$(PYTHON3_VERSION)"
+		--with-rlm-python3-config-bin="$(STAGING_DIR)/host/bin/python$(PYTHON3_VERSION)-config"
 else
   CONFIGURE_ARGS+= --without-rlm_python3
 endif
diff --git a/net/freeradius3/patches/004-fix-target-python-header-detection.patch b/net/freeradius3/patches/004-fix-target-python-header-detection.patch
deleted file mode 100644
index c1f1c74f9b..0000000000
--- a/net/freeradius3/patches/004-fix-target-python-header-detection.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/src/modules/rlm_python3/configure
-+++ b/src/modules/rlm_python3/configure
-@@ -2928,15 +2928,15 @@ fi
- 
- 
- 	if test x$fail = x; then
--		PY_PREFIX=`${PYTHON3_BIN} -c 'import sys ; print(sys.prefix)'`
-+		PY_PREFIX="$OPENWRTTARGET_PY3_PREFIX"
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: Python sys.prefix \"${PY_PREFIX}\"" >&5
- $as_echo "$as_me: Python sys.prefix \"${PY_PREFIX}\"" >&6;}
- 
--		PY_EXEC_PREFIX=`${PYTHON3_BIN} -c 'import sys ; print(sys.exec_prefix)'`
-+		PY_EXEC_PREFIX="$OPENWRTTARGET_PY3_PREFIX"
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: Python sys.exec_prefix \"${PY_EXEC_PREFIX}\"" >&5
- $as_echo "$as_me: Python sys.exec_prefix \"${PY_EXEC_PREFIX}\"" >&6;}
- 
--		PY_SYS_VERSION=`${PYTHON3_BIN} -c 'import sys ; print(sys.version[0:3])'`
-+		PY_SYS_VERSION="$OPENWRTTARGET_PY3_SYS_VERSION"
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: Python sys.version \"${PY_SYS_VERSION}\"" >&5
- $as_echo "$as_me: Python sys.version \"${PY_SYS_VERSION}\"" >&6;}
- 
---- a/src/modules/rlm_python3/configure.ac
-+++ b/src/modules/rlm_python3/configure.ac
-@@ -65,13 +65,13 @@ if test x$with_[]modname != xno; then
- 	)
- 
- 	if test x$fail = x; then
--		PY_PREFIX=`${PYTHON3_BIN} -c 'import sys ; print(sys.prefix)'`
-+		PY_PREFIX="$OPENWRTTARGET_PY3_PREFIX"
- 		AC_MSG_NOTICE([Python sys.prefix \"${PY_PREFIX}\"])
- 
--		PY_EXEC_PREFIX=`${PYTHON3_BIN} -c 'import sys ; print(sys.exec_prefix)'`
-+		PY_EXEC_PREFIX="$OPENWRTTARGET_PY3_PREFIX"
- 		AC_MSG_NOTICE([Python sys.exec_prefix \"${PY_EXEC_PREFIX}\"])
- 
--		PY_SYS_VERSION=`${PYTHON3_BIN} -c 'import sys ; print(sys.version[[0:3]])'`
-+		PY_SYS_VERSION="$OPENWRTTARGET_PY3_SYS_VERSION"
- 		AC_MSG_NOTICE([Python sys.version \"${PY_SYS_VERSION}\"])
- 
- 		if test "x$PY_LIB_DIR" = "x"; then