diff options
| author |   Michael Stewart <vericgar@gentoo.org> | 2006-06-05 04:55:21 +0000 |
|---|---|---|
| committer | Michael Stewart <vericgar@gentoo.org> | 2006-06-05 04:55:21 +0000 |
| commit | ee67ffd3fe7f77fbab8f4138334b7e0c434ebb16 (patch) | |
| tree | 7f66241f2ed7003334894141b07bb9ea76725578 /dev-libs/apr-util | |
| parent | Add patch to allow correct linking with --as-needed (diff) | |
| download | gentoo-2-ee67ffd3fe7f77fbab8f4138334b7e0c434ebb16.tar.gz gentoo-2-ee67ffd3fe7f77fbab8f4138334b7e0c434ebb16.tar.bz2 gentoo-2-ee67ffd3fe7f77fbab8f4138334b7e0c434ebb16.zip | |
Add patch to allow correct linking with --as-needed
(Portage version: 2.1_rc4-r1)
Diffstat (limited to 'dev-libs/apr-util')
| -rw-r--r-- | dev-libs/apr-util/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/apr-util/apr-util-0.9.12.ebuild | 12 | ||||
| -rw-r--r-- | dev-libs/apr-util/files/apr-util-0.9.12-linking.patch | 13 |
3 files changed, 27 insertions, 4 deletions
diff --git a/dev-libs/apr-util/ChangeLog b/dev-libs/apr-util/ChangeLog index 56854646a626..00a8d26738e8 100644 --- a/dev-libs/apr-util/ChangeLog +++ b/dev-libs/apr-util/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/apr-util # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.52 2006/06/04 13:27:10 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.53 2006/06/05 04:55:21 vericgar Exp $ + + 05 Jun 2006; Michael Stewart <vericgar@gentoo.org> + +files/apr-util-0.9.12-linking.patch, apr-util-0.9.12.ebuild: + Add patch to allow correct linking with --as-needed 04 Jun 2006; Luca Longinotti <chtekk@gentoo.org> apr-util-0.9.7.ebuild, apr-util-0.9.12.ebuild, apr-util-1.2.2.ebuild, apr-util-1.2.7.ebuild: diff --git a/dev-libs/apr-util/apr-util-0.9.12.ebuild b/dev-libs/apr-util/apr-util-0.9.12.ebuild index dc1e09984c8c..f35ce88ca58f 100644 --- a/dev-libs/apr-util/apr-util-0.9.12.ebuild +++ b/dev-libs/apr-util/apr-util-0.9.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-0.9.12.ebuild,v 1.5 2006/06/04 13:23:34 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-0.9.12.ebuild,v 1.6 2006/06/05 04:55:21 vericgar Exp $ inherit eutils flag-o-matic libtool db-use @@ -20,10 +20,16 @@ DEPEND="dev-libs/expat gdbm? ( sys-libs/gdbm ) ldap? ( =net-nds/openldap-2* )" -src_compile() { - filter-ldflags -Wl,--as-needed --as-needed +src_unpack() { + unpack ${A} || die + cd ${S} || die + epatch ${FILESDIR}/apr-util-0.9.12-linking.patch elibtoolize || die "elibtoolize failed" +} + + +src_compile() { local myconf="" diff --git a/dev-libs/apr-util/files/apr-util-0.9.12-linking.patch b/dev-libs/apr-util/files/apr-util-0.9.12-linking.patch new file mode 100644 index 000000000000..87524c32c3dd --- /dev/null +++ b/dev-libs/apr-util/files/apr-util-0.9.12-linking.patch @@ -0,0 +1,13 @@ +Index: apr-util-0.9.12/Makefile.in +=================================================================== +--- apr-util-0.9.12.orig/Makefile.in ++++ apr-util-0.9.12/Makefile.in +@@ -81,7 +81,7 @@ install: $(TARGET_LIB) + + $(TARGET_LIB): + @objects="`find $(SUBDIRS) -name expat -prune -o -name 'gen_uri_delims.@so_ext@' -prune -o -name '*.@so_ext@' -print`"; \ +- tmpcmd="$(LINK) @lib_target@ @EXTRA_OS_LINK@"; \ ++ tmpcmd="$(LINK) $(APRUTIL_LDFLAGS) @lib_target@ @EXTRA_OS_LINK@ $(APRUTIL_LIBS)"; \ + echo $$tmpcmd; \ + $$tmpcmd && touch $@ + |