packages: bind/bind.spec, bind/bind-ac-libs.patch (NEW) - fix /usr/lib poll...

baggins baggins at pld-linux.org
Wed Aug 3 11:52:57 CEST 2011


Author: baggins                      Date: Wed Aug  3 09:52:57 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix /usr/lib pollution

---- Files affected:
packages/bind:
   bind.spec (1.322 -> 1.323) , bind-ac-libs.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/bind/bind.spec
diff -u packages/bind/bind.spec:1.322 packages/bind/bind.spec:1.323
--- packages/bind/bind.spec:1.322	Wed Aug  3 08:37:56 2011
+++ packages/bind/bind.spec	Wed Aug  3 11:52:52 2011
@@ -65,6 +65,7 @@
 Patch1:		%{name}-link.patch
 Patch2:		%{name}-pmake.patch
 Patch3:		%{name}-sdb-ldap.patch
+Patch4:		%{name}-ac-libs.patch
 URL:		https://www.isc.org/software/bind
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -357,6 +358,7 @@
 %patch1 -p1
 %patch2 -p1
 %{?with_ldap:%patch3 -p1}
+%patch4 -p1
 %{?with_hip:mv bind-hip/hip_55.[ch] lib/dns/rdata/generic}
 
 
@@ -631,6 +633,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.323  2011/08/03 09:52:52  baggins
+- fix /usr/lib pollution
+
 Revision 1.322  2011/08/03 06:37:56  baggins
 - don't use _prefix in configure options (prevent .la pollution)
 

================================================================
Index: packages/bind/bind-ac-libs.patch
diff -u /dev/null packages/bind/bind-ac-libs.patch:1.1
--- /dev/null	Wed Aug  3 11:52:57 2011
+++ packages/bind/bind-ac-libs.patch	Wed Aug  3 11:52:52 2011
@@ -0,0 +1,58 @@
+--- 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
+@@ -587,7 +587,7 @@
+ 				fi
+ 				;;
+ 			*)
+-				DNS_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto"
++				DNS_OPENSSL_LIBS="-lcrypto"
+ 				;;
+ 			esac
+ 		fi
+@@ -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()],
+@@ -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)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bind/bind.spec?r1=1.322&r2=1.323&f=u



More information about the pld-cvs-commit mailing list