diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2012-09-19 16:26:20 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2012-09-19 16:26:20 +0000 |
| commit | 45abb6652fdcf5cb073dfc4fdf3032d90a67714f (patch) | |
| tree | a90130bb8cdf2fdc99523a0cdada5d5d08d9e3c9 /sys-freebsd/freebsd-lib | |
| parent | whitespace (diff) | |
| download | gentoo-2-45abb6652fdcf5cb073dfc4fdf3032d90a67714f.tar.gz gentoo-2-45abb6652fdcf5cb073dfc4fdf3032d90a67714f.tar.bz2 gentoo-2-45abb6652fdcf5cb073dfc4fdf3032d90a67714f.zip | |
use OBJDIR instead of CURDIR for adding -L in patches, this should fix bug #419477 in a cleaner way.
(Portage version: 2.2.0_alpha129/cvs/Linux x86_64)
Diffstat (limited to 'sys-freebsd/freebsd-lib')
4 files changed, 10 insertions, 11 deletions
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog index 2c62b24c9955..3000161e4489 100644 --- a/sys-freebsd/freebsd-lib/ChangeLog +++ b/sys-freebsd/freebsd-lib/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-freebsd/freebsd-lib # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.159 2012/09/19 15:55:44 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.160 2012/09/19 16:26:20 aballier Exp $ + + 19 Sep 2012; Alexis Ballier <aballier@gentoo.org> + files/freebsd-lib-8.0-rpcsec_gss.patch, files/freebsd-lib-9.0-liblink.patch, + freebsd-lib-9.1_rc1.ebuild: + use OBJDIR instead of CURDIR for adding -L in patches, this should fix bug + #419477 in a cleaner way. 19 Sep 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.1_rc1.ebuild: do not append -isystem /usr/include which is the default and causes problems diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch index 3b23387ce076..a7de06fadf56 100644 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch +++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch @@ -6,7 +6,7 @@ Without this linking fails during a stage3 build. DPADD+= ${LIBGSSAPI} LDADD+= -lgssapi -+LDFLAGS+= -L${.CURDIR}/../libgssapi ++LDFLAGS+= -L${.OBJDIR}/../libgssapi VERSION_DEF= ${.CURDIR}/../libc/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch index 5d7526f59508..f8e470736c64 100644 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch +++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch @@ -16,6 +16,6 @@ diff -uNr lib.ol/librtld_db/Makefile lib/librtld_db/Makefile CFLAGS+= -I${.CURDIR} +LDADD+=-lutil -lproc -+LDFLAGS+=-L${.CURDIR}/../libutil -L${.CURDIR}/../libproc ++LDFLAGS+=-L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc .include <bsd.lib.mk> diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild index f9069319c4da..6b6be41c1583 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild,v 1.2 2012/09/19 15:55:44 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild,v 1.3 2012/09/19 16:26:20 aballier Exp $ EAPI=2 @@ -302,13 +302,6 @@ do_compile() { export RAW_LDFLAGS=$(raw-ldflags) - #fixes bug 419477, multilib support - cd "${S}" - sed -i -e "s:^LDFLAGS+=.*:LDFLAGS+=-L ${MAKEOBJDIRPREFIX}/${S}/libgssapi:" \ - librpcsec_gss/Makefile || die "Problem fixing \"librpcsec_gss/Makefile" - sed -i -e "s:^LDFLAGS+=.*:LDFLAGS+=-L ${MAKEOBJDIRPREFIX}/${S}/libutil -L ${MAKEOBJDIRPREFIX}/${S}/libproc:" \ - librtld_db/Makefile || die "Problem fixing \"librtld_db/Makefile" - # Everything is now setup, build it! for i in $(get_subdirs) ; do einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}" |