Fix building of helper apps respecting LDFLAGS (bug #391279) and for --as-needed.

Package-Manager: portage-2.2.01.19572-prefix/cvs/Darwin i386

4 files changed, 159 insertions, 9 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index 7a469d078dd2..5132c0cc4f41 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/exim
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.210 2011/10/10 17:13:21 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.211 2011/11/29 18:21:19 grobian Exp $
+
+  29 Nov 2011; Fabian Groffen <grobian@gentoo.org>
+  +files/exim-4.77-as-needed-ldflags.patch, exim-4.77.ebuild:
+  Fix building of helper apps respecting LDFLAGS (bug #391279) and for --as-
+  needed.
 
   10 Oct 2011; Fabian Groffen <grobian@gentoo.org> exim-4.77.ebuild:
   Add USE=doc to install HTML documentation, bug #331737
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 7dafbdaf6b21..34d7d3458e5f 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -11,6 +11,7 @@ AUX exim-4.75-makefile-freebsd.patch 1206 RMD160 a0e394d04a1ff7a4caf09fb0a078dbf
 AUX exim-4.76-as-needed.patch 926 RMD160 df9807c874073d245a1687f437134f448e5e87ed SHA1 308604b690744077adca4d4fca26658d65652356 SHA256 7cd6f5b736aa7bd3759779b85f3796816ee844311219442877a7124d2150fff4
 AUX exim-4.76-crosscompile.patch 462 RMD160 3f8bb3b3ea76b0d0f73b0f18dc6767788761b14a SHA1 30d3a0d7d5f08609f4d684d7f9c405c30c2ccdb6 SHA256 25ba013858b0fc239e24166554c1e28832d3d25801b53ca633f289bc4ae72b8e
 AUX exim-4.76-dsn.patch 822 RMD160 4daa5e72ae8617cb8ad233450dd8c52f939af1a4 SHA1 91d44aa2ef34b718ea640c053a33d767996d6d9f SHA256 2b36099285ff271f1c6db189435ebe3c2d3f3e8407ac11a041c7ea21b1997463
+AUX exim-4.77-as-needed-ldflags.patch 5954 RMD160 10348033ae0d928378fefc0c2728ffc7f460b3f7 SHA1 470e36579c13a0641f8270c814c36bcd3186a574 SHA256 3960f6883f7c3b44110ca5916ad8fa63f829516624c011a807cda00972b4dffd
 AUX exim-4.77-makefile-freebsd.patch 1124 RMD160 af135dc3ffab9c288f7d7e55c74a17a6acce633c SHA1 598624573159431bd70485fb3d394eddd6cf3a1d SHA256 50108e7f26ca2acb594d3d9a57c25ad041f32ada729b604da7378e9376b3ac7c
 AUX exim.confd 62 RMD160 d8dcabf184ffb9066ad45c3e77cce1ec0392a143 SHA1 c56feda3c3193fad26852310da8ef24ef91f60f6 SHA256 668f912565a59926957090c6143f669f0e9de2cf441507d3c05fcd046865b401
 AUX exim.logrotate 193 RMD160 af18b62c88fd86b421abe487a232f26bf5287dd5 SHA1 c12f3b44de8a51dd41c4dbf2179a2b0f9d4cbaf4 SHA256 41930f48d934dea0ad14a868c591fe1c47a5f6403d66f8a2d5f4092cd13f8b5c
@@ -23,13 +24,13 @@ DIST exim_469_dsn_1_3.patch 40222 RMD160 c744d6b5b388716e423529eda5b807aa8b9da2e
 DIST system_filter.exim.gz 3075 RMD160 47bcc6de402d896b73fd01d7f0d3c3ecbad9cf0b SHA1 384d138d8612f3a80b2b68f272b43cd69bc4411a SHA256 3a3471b486a09e0a0153f7b520e1eaf26d21b97d73ea8348bdc593c00eb1e437
 EBUILD exim-4.76-r1.ebuild 10419 RMD160 08693ae53cf2ecf1c4da7801a4af6001da5c5bc4 SHA1 45b7fc34c2c1598e18f67285aa7d1fabfed2fbbe SHA256 0892ec6c900826a34df31a675a80b42f3e2316dac1c09b154982fa541ee622cb
 EBUILD exim-4.76.ebuild 10316 RMD160 930cdf30324c6ad0d95d7dfa5017a2ef516b3a60 SHA1 67fe0632a088ba539c40baf0c0d6d0a143c1fb69 SHA256 733501c20911916e0bf6ec584921d7a6c23de8b29a5b149400636a9ef233b773
-EBUILD exim-4.77.ebuild 10615 RMD160 306b0fbdd628e3eba54fffa5b1b28371f36a3f80 SHA1 23a7502e5e0898df790c2c85cc396a762a23347c SHA256 1caebf38a349dfd740d118f96dc33431eeef94482a2f0561f8d3f5b5808a00e6
-MISC ChangeLog 42612 RMD160 759b9afa79e63058a320e41d81fe9a1f9fe94e1f SHA1 a41a29e9c90132768808e667377250e97800499e SHA256 af28558cac2244b4cfa9de23ee5e2ecb5d445df20b68d8b8c5aad2b9c5456060
+EBUILD exim-4.77.ebuild 10640 RMD160 613a4f0d0e51e0e7077b3770f42bc732e3e882ef SHA1 e2011375b6d43ffdfe3fa47b0875019bc4cf3981 SHA256 c45439e25c8a5cf6805e150ea8fd01c96f7ad3bcaac05bc96f789e0d62142280
+MISC ChangeLog 42813 RMD160 25c071e7fb11f8e5e010971a56f5ab8733648240 SHA1 e4b29e449069995b52f239b266688a744ffa7b34 SHA256 484422e29e750e534fe9d6680ab22f0d8f51e7f968b69958c109a3178de78f80
 MISC metadata.xml 1745 RMD160 9a78e06e7038d79e2eb1e08017a2a5e6b53aa63f SHA1 892aff75716b8b21fda4d61289cc388ce0b7a3d1 SHA256 6c25800686eeb918e03fbe6caa54c38512c843e8eca3a2db8783289a9b12bea5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (Darwin)
 
-iEYEARECAAYFAk6TJ7cACgkQX3X2B8XHTon2jwCeNhkf7BfIB16/PzEAyLXnW8dM
-JrYAniIY0eVmxaPbFdkjMZ+hLhKYU4SX
-=2OV5
+iEYEARECAAYFAk7VIqQACgkQX3X2B8XHTomN+ACdHs8wZ1mYnNrEtPm7rV33r/BR
+74oAn2e7MLQkzCyIeq/p0gM0NMGh2ae2
+=nOdM
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/exim/exim-4.77.ebuild b/mail-mta/exim/exim-4.77.ebuild
index 53aae87fcb6a..411367c26dc5 100644
--- a/mail-mta/exim/exim-4.77.ebuild
+++ b/mail-mta/exim/exim-4.77.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.77.ebuild,v 1.3 2011/10/10 17:13:21 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.77.ebuild,v 1.4 2011/11/29 18:21:19 grobian Exp $
 
 EAPI="3"
 
@@ -75,8 +75,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/exim-4.74-localscan_dlopen.patch
 	epatch "${FILESDIR}"/exim-4.69-r1.27021.patch
 	epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
-	epatch "${FILESDIR}"/exim-4.77-makefile-freebsd.patch
-	epatch "${FILESDIR}"/exim-4.76-as-needed.patch # 352265
+	epatch "${FILESDIR}"/exim-4.77-makefile-freebsd.patch # 235785
+	epatch "${FILESDIR}"/exim-4.77-as-needed-ldflags.patch # 352265, 391279
 	epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
 
 	use maildir && epatch "${FILESDIR}"/exim-4.20-maildir.patch
diff --git a/mail-mta/exim/files/exim-4.77-as-needed-ldflags.patch b/mail-mta/exim/files/exim-4.77-as-needed-ldflags.patch
new file mode 100644
index 000000000000..4eac9aa3a2a0
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.77-as-needed-ldflags.patch
@@ -0,0 +1,144 @@
+https://bugs.gentoo.org/show_bug.cgi?id=352265
+
+Make sure LDFLAGS comes first, such that all libraries are considered,
+and not discarded when --as-needed is in effect.
+
+https://bugs.gentoo.org/show_bug.cgi?id=391279
+
+Use LDFLAGS for all targets, not just the exim binary, such that
+--as-needed works as well.
+
+
+--- OS/Makefile-Base
++++ OS/Makefile-Base
+@@ -327,12 +327,12 @@
+ 	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE) version.c
+ 	rm -f exim
+ 	@echo "$(LNCC) -o exim"
+-	$(FE)$(PURIFY) $(LNCC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \
++	$(FE)$(PURIFY) $(LNCC) -o exim $(LDFLAGS) $(OBJ_EXIM) version.o \
+ 	  routers/routers.a transports/transports.a lookups/lookups.a \
+ 	  auths/auths.a pdkim/pdkim.a \
+ 	  $(LIBRESOLV) $(LIBS) $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) \
+ 	  $(EXTRALIBS_EXIM) $(DBMLIB) $(LOOKUP_LIBS) $(AUTH_LIBS) \
+-	  $(PERL_LIBS) $(TLS_LIBS) $(PCRE_LIBS) $(LDFLAGS)
++	  $(PERL_LIBS) $(TLS_LIBS) $(PCRE_LIBS) $(LFLAGS)
+ 	@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
+ 	  echo $(STRIP_COMMAND) exim; \
+ 	  $(STRIP_COMMAND) exim; \
+@@ -340,8 +340,8 @@
+ 
+ exim_dumpdb: $(OBJ_DUMPDB)
+ 	@echo "$(LNCC) -o exim_dumpdb"
+-	$(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_dumpdb $(LFLAGS) $(OBJ_DUMPDB) \
+-	  $(LIBS) $(EXTRALIBS) $(DBMLIB)
++	$(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_dumpdb $(LDFLAGS) $(OBJ_DUMPDB) \
++	  $(LIBS) $(EXTRALIBS) $(DBMLIB) $(LFLAGS)
+ 	@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
+ 	  echo $(STRIP_COMMAND) exim_dumpdb; \
+ 	  $(STRIP_COMMAND) exim_dumpdb; \
+@@ -355,8 +355,8 @@
+ 
+ exim_fixdb:  $(OBJ_FIXDB) auths/auths.a
+ 	@echo "$(LNCC) -o exim_fixdb"
+-	$(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_fixdb $(LFLAGS) $(OBJ_FIXDB) \
+-	  auths/auths.a $(LIBS) $(EXTRALIBS) $(DBMLIB)
++	$(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_fixdb $(LDFLAGS) $(OBJ_FIXDB) \
++	  auths/auths.a $(LIBS) $(EXTRALIBS) $(DBMLIB) $(LFLAGS)
+ 	@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
+ 	  echo $(STRIP_COMMAND) exim_fixdb; \
+ 	  $(STRIP_COMMAND) exim_fixdb; \
+@@ -370,8 +370,8 @@
+ 
+ exim_tidydb: $(OBJ_TIDYDB)
+ 	@echo "$(LNCC) -o exim_tidydb"
+-	$(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_tidydb $(LFLAGS) $(OBJ_TIDYDB) \
+-	  $(LIBS) $(EXTRALIBS) $(DBMLIB)
++	$(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_tidydb $(LDFLAGS) $(OBJ_TIDYDB) \
++	  $(LIBS) $(EXTRALIBS) $(DBMLIB) $(LFLAGS)
+ 	@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
+ 	  echo $(STRIP_COMMAND) exim_tidydb; \
+ 	  $(STRIP_COMMAND) exim_tidydb; \
+@@ -383,8 +383,8 @@
+ 
+ exim_dbmbuild: exim_dbmbuild.o
+ 	@echo "$(LNCC) -o exim_dbmbuild"
+-	$(FE)$(LNCC) -o exim_dbmbuild $(LFLAGS) exim_dbmbuild.o \
+-	  $(LIBS) $(EXTRALIBS) $(DBMLIB)
++	$(FE)$(LNCC) -o exim_dbmbuild $(LDFLAGS) exim_dbmbuild.o \
++	  $(LIBS) $(EXTRALIBS) $(DBMLIB) $(LFLAGS)
+ 	@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
+ 	  echo $(STRIP_COMMAND) exim_dbmbuild; \
+ 	  $(STRIP_COMMAND) exim_dbmbuild; \
+@@ -398,8 +398,8 @@
+ 	@echo "$(CC) exim_lock.c"
+ 	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) exim_lock.c
+ 	@echo "$(LNCC) -o exim_lock"
+-	$(FE)$(LNCC) -o exim_lock $(LFLAGS) exim_lock.o  \
+-	  $(LIBS) $(EXTRALIBS)
++	$(FE)$(LNCC) -o exim_lock $(LDFLAGS) exim_lock.o  \
++	  $(LIBS) $(EXTRALIBS) $(LFLAGS)
+ 	@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
+ 	  echo $(STRIP_COMMAND) exim_lock; \
+ 	  $(STRIP_COMMAND) exim_lock; \
+@@ -429,9 +429,9 @@
+ 	$(FE)$(CC) -o em_version.o -c \
+ 	  $(CFLAGS) $(XINCLUDE) -I. ../exim_monitor/em_version.c
+ 	@echo "$(LNCC) -o eximon.bin"
+-	$(FE)$(PURIFY) $(LNCC) -o eximon.bin em_version.o $(LFLAGS) $(XLFLAGS) \
++	$(FE)$(PURIFY) $(LNCC) -o eximon.bin em_version.o $(LDFLAGS) $(XLFLAGS) \
+ 	$(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 $(PCRE_LIBS) \
+-	  $(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc
++	  $(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc $(LFLAGS)
+ 	@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
+ 	  echo $(STRIP_COMMAND) eximon.bin; \
+ 	  $(STRIP_COMMAND) eximon.bin; \
+@@ -706,9 +706,9 @@
+ test_dbfn:   config.h dbfn.c dummies.o sa-globals.o sa-os.o store.o \
+ 	       string.o tod.o version.o
+ 	$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE dbfn.c
+-	$(LNCC) -o test_dbfn $(LFLAGS) dbfn.o \
++	$(LNCC) -o test_dbfn $(LDFLAGS) dbfn.o \
+ 	  dummies.o sa-globals.o sa-os.o store.o string.o \
+-	  tod.o version.o $(LIBS) $(DBMLIB)
++	  tod.o version.o $(LIBS) $(DBMLIB) $(LFLAGS)
+ 	rm -f dbfn.o
+ 
+ test_host:   config.h child.c host.c dns.c dummies.c sa-globals.o os.o \
+@@ -717,28 +717,28 @@
+ 	$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST host.c
+ 	$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST dns.c
+ 	$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST dummies.c
+-	$(LNCC) -o test_host $(LFLAGS) \
++	$(LNCC) -o test_host $(LDFLAGS) \
+ 	  host.o child.o dns.o dummies.o sa-globals.o os.o store.o string.o \
+-	  tod.o tree.o $(LIBS) $(LIBRESOLV)
++	  tod.o tree.o $(LIBS) $(LIBRESOLV) $(LFLAGS)
+ 	rm -f child.o dummies.o host.o dns.o
+ 
+ test_os:     os.h os.c dummies.o sa-globals.o store.o string.o tod.o
+ 	$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE os.c
+-	$(LNCC) -o test_os $(LFLAGS) os.o dummies.o \
+-	  sa-globals.o store.o string.o tod.o $(LIBS)
++	$(LNCC) -o test_os $(LDFLAGS) os.o dummies.o \
++	  sa-globals.o store.o string.o tod.o $(LIBS) $(LFLAGS)
+ 	rm -f os.o
+ 
+ test_parse:  config.h parse.c dummies.o sa-globals.o \
+ 	     store.o string.o tod.o version.o
+ 	$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE parse.c
+-	$(LNCC) -o test_parse $(LFLAGS) parse.o \
+-	  dummies.o sa-globals.o store.o string.o tod.o version.o
++	$(LNCC) -o test_parse $(LDFLAGS) parse.o \
++	  dummies.o sa-globals.o store.o string.o tod.o version.o $(LFLAGS)
+ 	rm -f parse.o
+ 
+ test_string: config.h string.c dummies.o sa-globals.o store.o tod.o
+ 	$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE string.c
+-	$(LNCC) -o test_string $(LFLAGS) -DSTAND_ALONE string.o \
+-	  dummies.o sa-globals.o store.o tod.o $(LIBS)
++	$(LNCC) -o test_string $(LDFLAGS) -DSTAND_ALONE string.o \
++	  dummies.o sa-globals.o store.o tod.o $(LIBS) $(LFLAGS)
+ 	rm -f string.o
+ 
+ # End