From 23fe6c99ddf376d523bf0837e22e01cf65cb1234 Mon Sep 17 00:00:00 2001 From: Alin Năstac Date: Wed, 8 Jul 2009 15:21:34 +0000 Subject: Fix linker error when --as-needed is forced (#276665). (Portage version: 2.1.6.13/cvs/Linux x86_64) --- mail-filter/sid-milter/ChangeLog | 6 +++++- .../files/sid-milter-1.0.0-as-needed.patch | 21 +++++++++++++++++++++ mail-filter/sid-milter/sid-milter-1.0.0-r2.ebuild | 3 ++- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 mail-filter/sid-milter/files/sid-milter-1.0.0-as-needed.patch 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 + +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 -files/sid-milter-0.2.14-auth.patch, 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" -- cgit v1.2.3-65-gdbad