Fix linker error when --as-needed is forced (#276665).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 35 insertions, 8 deletions

diff --git a/mail-filter/sid-milter/ChangeLog b/mail-filter/sid-milter/ChangeLog
index 62bf1f92663e..e1eadc8a1e66 100644
--- a/mail-filter/sid-milter/ChangeLog
+++ b/mail-filter/sid-milter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/sid-milter
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/sid-milter/ChangeLog,v 1.11 2009/05/09 12:29:01 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/sid-milter/ChangeLog,v 1.12 2009/07/08 15:21:34 mrness Exp $
+
+  08 Jul 2009; Alin Năstac <mrness@gentoo.org>
+  +files/sid-milter-1.0.0-as-needed.patch, sid-milter-1.0.0-r2.ebuild:
+  Fix linker error when --as-needed is forced (#276665).
 
   09 May 2009; Alin Năstac <mrness@gentoo.org>
   -files/sid-milter-0.2.14-auth.patch,
diff --git a/mail-filter/sid-milter/Manifest b/mail-filter/sid-milter/Manifest
index c1939bbc0399..affed9029dd4 100644
--- a/mail-filter/sid-milter/Manifest
+++ b/mail-filter/sid-milter/Manifest
@@ -4,15 +4,16 @@ Hash: SHA1
 AUX gentoo-config.m4 134 RMD160 fa59a3250591c29d575e828deb4c3bb0ebfafd60 SHA1 5a1f335a7dde4665344e92dd9cb55d65585e50d5 SHA256 9c640f53626f42256bc1616d3adcbfc7fb3e37a3bb74863ab2292d9e8658b3df
 AUX sid-filter.conf 232 RMD160 680ac0ac2c1c34a772e57aec028332f40958049d SHA1 bda5b00650acd6a79c1c56405f06842916aa0781 SHA256 17ac7a949bd06e369ddc9da81dae7d44ece8b83bbfdc587357c92cd368a7cff0
 AUX sid-filter.init 561 RMD160 4985cd7b429af32795bb8f36bcdbeca248f33882 SHA1 81cbe378b67e7de2c534b0609fdf72d39165e7fd SHA256 dbdcd808d4c1e486fb314c36142392c54ebe094a6504e452bd7227d47b8c875f
+AUX sid-milter-1.0.0-as-needed.patch 1213 RMD160 d846aaa04a390d5b7ee6e7a342f7b94d365679b0 SHA1 f864e9135880dd4c675d2ff35e99c6825b91dff6 SHA256 8c77f7be8f99d69e75eced9aa8880acb0ada60aec7186bc2d48b823855b902a0
 AUX sid-milter-1.0.0-nopra_on_spf1.patch 1777 RMD160 2b87e1759a806ef6f8b09dbbc99d51dc663a80be SHA1 b54ed8bc77cbbeb83af13d7e322c011dfe66fc17 SHA256 2a01bb115496583682e1e6f78370acc267c7e45067bb4dd91daa90dbf7107942
 DIST sid-milter-1.0.0.tar.gz 351161 RMD160 7aca88c5d1c18581a17a779c87e7dda3d0091e0e SHA1 dd6517b36933083923c3094cf7f09e74825e7dcb SHA256 b303bf0c43afd0cb0c814b8c862b8d22563d1203339ac130036873e79f696376
-EBUILD sid-milter-1.0.0-r2.ebuild 1688 RMD160 f20cbb84c1f6902064386a66e5d6cce62e01d3ea SHA1 6dbfbf7c31b230d9419981eb93b39122778f6c55 SHA256 4038e07b68d8d8c97e944926eb66dcddc39c14dfbcc08fe8d14acba0c0e49544
-MISC ChangeLog 2191 RMD160 cda1880dac03cb92db78f8dfff43e73e80273093 SHA1 90380d5f4bff78b09a86f746ca7cf056ea4c2b30 SHA256 e7139bb4e2536579a7e48b7afadf3f3daf7c27cd69cf739cf5b19c2f866d76a7
+EBUILD sid-milter-1.0.0-r2.ebuild 1731 RMD160 876612dab8b04929afe7c49156f734f5fce5498a SHA1 0b16495eb68e596a37c876699a0e46eeb90ab41b SHA256 c0bb37170f75275a27dc03f9d11959edea2664b1206f28611aaa57d7b18d433a
+MISC ChangeLog 2368 RMD160 1e700f4874a3d38cecaac5e8fb4f2ffa51240445 SHA1 fb93d82b7856a441b3a1800cbf46e0224a527cca SHA256 b82a5d8dfb16434eb339d804cd7f99e7f965504d51a4209e902d97f41872137c
 MISC metadata.xml 447 RMD160 d12715bcb22b684ecc8d69400ea109bb1898b068 SHA1 4967c8a01ec72918142454d4795637048283ef63 SHA256 c014f1e81516b87fd0b79be261b843a3ed2d8f981baf0177c3805ef8e51bac17
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoFkzMACgkQts85UDFmaOXjRQCfXeHlnKEKikOCAkXNpt6GyJEc
-HP4An0qX4TjegfJ6PZThCpmTJemogZy4
-=ELmY
+iEYEARECAAYFAkpUuYcACgkQts85UDFmaOXy2gCfV22UkRxrm/I0YD+lAEV51cL4
+4RgAnjOyfgzCQeyRZBmUmGxreQl+Zf6b
+=xprQ
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/sid-milter/files/sid-milter-1.0.0-as-needed.patch b/mail-filter/sid-milter/files/sid-milter-1.0.0-as-needed.patch
new file mode 100644
index 000000000000..365604f721f6
--- /dev/null
+++ b/mail-filter/sid-milter/files/sid-milter-1.0.0-as-needed.patch
@@ -0,0 +1,21 @@
+diff -Nru sid-milter-1.0.0.orig/devtools/M4/UNIX/defines.m4 sid-milter-1.0.0/devtools/M4/UNIX/defines.m4
+--- sid-milter-1.0.0.orig/devtools/M4/UNIX/defines.m4	2006-10-06 07:44:44.000000000 +0200
++++ sid-milter-1.0.0/devtools/M4/UNIX/defines.m4	2009-07-08 17:11:06.000000000 +0200
+@@ -26,7 +26,7 @@
+ CCLINK = ifdef(`confCCLINK', `confCCLINK', `confCC')
+ # Linker for libraries
+ LD=	ifdef(`confLD', `confLD', `confCC')
+-LDOPTS=	ifdef(`confLDOPTS', `confLDOPTS') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
++LDOPTS=	ifdef(`confLDOPTS', `confLDOPTS')
+ LDOPTS_SO= ${LDOPTS} ifdef(`confLDOPTS_SO', `confLDOPTS_SO', `-shared')
+ 
+ # Shell
+@@ -71,7 +71,7 @@
+ LIBADD= ifdef(`conf_'bldCURRENT_PRD`_LIBS', `conf_'bldCURRENT_PRD`_LIBS') 
+ 
+ # libraries required on your system
+-LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST') 
++LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST')  ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
+ 
+ # location of sendmail binary (usually /usr/sbin or /usr/lib)
+ BINDIR=	ifdef(`confMBINDIR', `confMBINDIR', `/usr/sbin')
diff --git a/mail-filter/sid-milter/sid-milter-1.0.0-r2.ebuild b/mail-filter/sid-milter/sid-milter-1.0.0-r2.ebuild
index a51b1d7bfd4f..01e1a6e87970 100644
--- a/mail-filter/sid-milter/sid-milter-1.0.0-r2.ebuild
+++ b/mail-filter/sid-milter/sid-milter-1.0.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/sid-milter/sid-milter-1.0.0-r2.ebuild,v 1.2 2009/05/09 12:29:01 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/sid-milter/sid-milter-1.0.0-r2.ebuild,v 1.3 2009/07/08 15:21:34 mrness Exp $
 
 EAPI="2"
 
@@ -27,6 +27,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-nopra_on_spf1.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
 
 	local ENVDEF=""
 	use ipv6 && ENVDEF="${ENVDEF} -DNETINET6"