X-Git-Url: http://git.pld-linux.org/?p=packages%2Fbind.git;a=blobdiff_plain;f=bind-ac-libs.patch;h=2e5beee828f6e565fc50621290f5f74d54ff5f81;hp=2c51689cdf56bc8e7fe1502f3412b0ebda775cb4;hb=HEAD;hpb=94d7f7c50a848515bd57691d0ff6e745b0b237fa

diff --git a/bind-ac-libs.patch b/bind-ac-libs.patch
index 2c51689..677cd99 100644
--- a/bind-ac-libs.patch
+++ b/bind-ac-libs.patch
@@ -1,58 +1,20 @@
---- bind-9.8.0-P4/configure.in~	2011-08-03 11:46:24.326770259 +0200
-+++ bind-9.8.0-P4/configure.in	2011-08-03 11:49:53.240770212 +0200
-@@ -882,7 +882,7 @@
- 		    then
- 			    LIBS="$TRY_LIBS"
- 		    else
--			    LIBS="-L$use_gssapi/lib $TRY_LIBS"
-+			    LIBS="$TRY_LIBS"
- 		    fi
- 		    AC_MSG_CHECKING(linking as $TRY_LIBS)
- 		    AC_TRY_LINK( , [gss_acquire_cred();krb5_init_context()],
-@@ -1420,7 +1420,7 @@
- 				fi
- 				;;
- 			*)
--				DST_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto"
-+				DST_OPENSSL_LIBS="-lcrypto"
- 				;;
- 			esac
- 		fi
-@@ -1596,7 +1596,7 @@
- 	*)
- 		if test -f $kame_path/lib/libinet6.a; then
- 			AC_MSG_RESULT($kame_path/lib/libinet6.a)
--			LIBS="-L$kame_path/lib -linet6 $LIBS"
-+			LIBS="-linet6 $LIBS"
- 		else
- 			AC_MSG_ERROR([$kame_path/lib/libinet6.a not found.
- 
-@@ -2989,16 +2989,16 @@
- case "$use_libiconv" in
- yes)
- 	if test X$prefix = XNONE ; then
--		iconvlib="-L/usr/local/lib -R/usr/local/lib -liconv"
-+		iconvlib="-liconv"
- 	else
--		iconvlib="-L$prefix/lib -R$prefix/lib -liconv"
-+		iconvlib="-liconv"
- 	fi
- 	;;
- no)
- 	iconvlib=
- 	;;
- *)
--	iconvlib="-L$use_libiconv/lib -R$use_libiconv/lib -liconv"
-+	iconvlib="-liconv"
- 	;;
- esac
- 
-@@ -3028,7 +3028,7 @@
- 	if test "$idnlib" != no; then
- 		IDNLIBS="$idnlib $iconvlib"
- 	else
--		IDNLIBS="-L$idn_path/lib -lidnkit $iconvlib"
-+		IDNLIBS="-lidnkit $iconvlib"
- 	fi
- fi
- AC_SUBST(IDNLIBS)
+--- bind-9.18.0/configure.ac~	2022-01-24 21:06:11.000000000 +0100
++++ bind-9.18.0/configure.ac	2022-01-27 13:36:04.136536700 +0100
+@@ -474,7 +474,7 @@ AS_IF([test "$enable_geoip" = "yes"],
+ 	       [ # default
+ 		   AX_SAVE_FLAGS([maxminddb])
+ 		   MAXMINDDB_CFLAGS="-I$with_maxminddb/include"
+-		   MAXMINDDB_LIBS="-L$with_maxminddb/lib"
++		   MAXMINDDB_LIBS=""
+ 		   CFLAGS="$CFLAGS $MAXMINDDB_CFLAGS"
+ 		   LIBS="$LIBS $MAXMINDDB_LIBS"
+ 		   AC_SEARCH_LIBS([MMDB_open], [maxminddb],
+@@ -1295,7 +1295,7 @@ AS_CASE([$with_libidn2],
+ 	[no],	[],
+ 	[*],	[AX_SAVE_FLAGS([libidn2])
+ 		 LIBIDN2_CFLAGS="-I$with_libidn2/include"
+-		 LIBIDN2_LIBS="-L$with_libidn2/lib"
++		 LIBIDN2_LIBS=""
+ 		 CFLAGS="$CFLAGS $LIBIDN2_CFLAGS"
+ 		 LIBS="$LIBS $LIBIDN2_LIBS"
+ 		 AC_CHECK_HEADERS([idn2.h],