diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2011-07-04 10:28:12 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2011-07-04 10:28:12 +0000 |
| commit | e504ec491a3faaea2cc4d36fcac97527e5155f8d (patch) | |
| tree | 910f15e1c141a2a18b388d981a42baa79fbbef53 /mail-mta | |
| parent | [sys-cluster/slurm] Update init.d reload stuff (diff) | |
| download | gentoo-2-e504ec491a3faaea2cc4d36fcac97527e5155f8d.tar.gz gentoo-2-e504ec491a3faaea2cc4d36fcac97527e5155f8d.tar.bz2 gentoo-2-e504ec491a3faaea2cc4d36fcac97527e5155f8d.zip | |
Fix linking order such that linking works correctly with as-needed, bug #352265
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
Diffstat (limited to 'mail-mta')
| -rw-r--r-- | mail-mta/exim/ChangeLog | 7 | ||||
| -rw-r--r-- | mail-mta/exim/exim-4.76.ebuild | 5 | ||||
| -rw-r--r-- | mail-mta/exim/files/exim-4.76-as-needed.patch | 22 |
3 files changed, 31 insertions, 3 deletions
diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog index abdc7f6f6452..7b8b83bffb97 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.203 2011/07/03 18:09:16 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.204 2011/07/04 10:28:12 grobian Exp $ + + 04 Jul 2011; Fabian Groffen <grobian@gentoo.org> exim-4.76.ebuild, + +files/exim-4.76-as-needed.patch: + Fix linking order such that linking works correctly with as-needed, bug + #352265 03 Jul 2011; Fabian Groffen <grobian@gentoo.org> files/exim-4.74-localscan_dlopen.patch: diff --git a/mail-mta/exim/exim-4.76.ebuild b/mail-mta/exim/exim-4.76.ebuild index 008dee0dfb1a..d7edd79413ed 100644 --- a/mail-mta/exim/exim-4.76.ebuild +++ b/mail-mta/exim/exim-4.76.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.76.ebuild,v 1.9 2011/05/16 18:39:04 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.76.ebuild,v 1.10 2011/07/04 10:28:12 grobian Exp $ EAPI="3" @@ -73,6 +73,7 @@ src_prepare() { epatch "${FILESDIR}"/exim-4.69-r1.27021.patch epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426 epatch "${FILESDIR}"/exim-4.75-makefile-freebsd.patch + epatch "${FILESDIR}"/exim-4.76-as-needed.patch # 352265 use maildir && epatch "${FILESDIR}"/exim-4.20-maildir.patch @@ -174,7 +175,7 @@ src_configure() { sed -i "s:# RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf:RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf:" Makefile sed -i "s:# RADIUS_LIB_TYPE=RADIUSCLIENT$:RADIUS_LIB_TYPE=RADIUSCLIENT:" Makefile fi - echo "EXTRALIBS=${myconf} ${LDFLAGS}" >> Makefile + echo "EXTRALIBS=${myconf}" >> Makefile # make iconv usage explicit echo "HAVE_ICONV=yes" >> Makefile diff --git a/mail-mta/exim/files/exim-4.76-as-needed.patch b/mail-mta/exim/files/exim-4.76-as-needed.patch new file mode 100644 index 000000000000..ba66d83ee518 --- /dev/null +++ b/mail-mta/exim/files/exim-4.76-as-needed.patch @@ -0,0 +1,22 @@ +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. + +--- 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; \ |