diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2012-05-25 12:37:04 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2012-05-25 12:37:04 +0000 |
| commit | c0dffbf4e43202a33cb92491ce7a94530157cb0a (patch) | |
| tree | eead8a79866976120b3e8dfccc07f18ef036a99c /sys-freebsd/freebsd-lib | |
| parent | replace -isystem path by -Ipath as append-flags seems not to like the former ... (diff) | |
| download | gentoo-2-c0dffbf4e43202a33cb92491ce7a94530157cb0a.tar.gz gentoo-2-c0dffbf4e43202a33cb92491ce7a94530157cb0a.tar.bz2 gentoo-2-c0dffbf4e43202a33cb92491ce7a94530157cb0a.zip | |
fix paths I broke by the addition of MAKEOBJDIRPREFIX
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Diffstat (limited to 'sys-freebsd/freebsd-lib')
| -rw-r--r-- | sys-freebsd/freebsd-lib/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog index a0a4575ad9ed..294c23dddd5b 100644 --- a/sys-freebsd/freebsd-lib/ChangeLog +++ b/sys-freebsd/freebsd-lib/ChangeLog @@ -1,6 +1,9 @@ # 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.143 2012/05/25 12:27:00 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.144 2012/05/25 12:37:04 aballier Exp $ + + 25 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild: + fix paths I broke by the addition of MAKEOBJDIRPREFIX 25 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild: replace -isystem path by -Ipath as append-flags seems not to like the former diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild index b41859e9114c..e9b19067ef4e 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.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.0-r2.ebuild,v 1.29 2012/05/25 12:27:00 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.30 2012/05/25 12:37:04 aballier Exp $ EAPI=2 @@ -212,15 +212,15 @@ bootstrap_csu() { cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}." freebsd_src_compile - append-flags "-B ${WORKDIR}/${csudir}" - append-ldflags "-B ${WORKDIR}/${csudir}" + append-flags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}" + append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}" } # Compile libssp_nonshared.a and add it's path to LDFLAGS. bootstrap_libssp_nonshared() { cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp." freebsd_src_compile - append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" + append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" export LDADD="-lssp_nonshared" } @@ -329,7 +329,7 @@ src_compile() { CHOST=${CTARGET} tc-export CC LD CXX RANLIB mymakeopts="${mymakeopts} NLS=" append-flags "-I/usr/${CTARGET}/usr/include" - append-ldflags "-L${WORKDIR}/lib/libc" + append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc" fi if is_crosscompile ; then |