diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2011-07-11 21:06:44 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2011-07-11 21:06:44 +0000 |
| commit | 769ac3b67a44feeb5fa8ee448c540d31574dcc5f (patch) | |
| tree | 9532e06b17a8af99284cb3386831e7cec5926995 /sys-freebsd | |
| parent | keyword ~x86-fbsd thanks to Johan Hattne, bug #319453 (diff) | |
| download | gentoo-2-769ac3b67a44feeb5fa8ee448c540d31574dcc5f.tar.gz gentoo-2-769ac3b67a44feeb5fa8ee448c540d31574dcc5f.tar.bz2 gentoo-2-769ac3b67a44feeb5fa8ee448c540d31574dcc5f.zip | |
fix cross compilation, build and install libthr/libpthread when cross compiling too
(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)
Diffstat (limited to 'sys-freebsd')
| -rw-r--r-- | sys-freebsd/freebsd-lib/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild | 15 |
2 files changed, 18 insertions, 3 deletions
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog index 6dd910472821..80bb2de16bfd 100644 --- a/sys-freebsd/freebsd-lib/ChangeLog +++ b/sys-freebsd/freebsd-lib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-freebsd/freebsd-lib # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.94 2011/07/10 17:47:59 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.95 2011/07/11 21:06:44 aballier Exp $ + + 11 Jul 2011; Alexis Ballier <aballier@gentoo.org> freebsd-lib-8.2-r1.ebuild: + fix cross compilation, build and install libthr/libpthread when cross + compiling too *freebsd-lib-8.2-r1 (10 Jul 2011) diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild index 24ba5a70c816..7499d15e2ce3 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.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/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild,v 1.2 2011/07/10 17:49:25 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild,v 1.3 2011/07/11 21:06:44 aballier Exp $ EAPI=2 @@ -223,7 +223,7 @@ src_compile() { append-ldflags "-B ${csudir}" # First compile libssp_nonshared.a and add it's path to LDFLAGS. - cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp." + cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp." $(freebsd_get_bmake) ${mymakeopts} || die "make libssp failed" append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" @@ -231,7 +231,13 @@ src_compile() { cd "${S}/libc" $(freebsd_get_bmake) ${mymakeopts} || die "make libc failed" cd "${S}/msun" + append-ldflags "-L${WORKDIR}/lib/libc" + export RAW_LDFLAGS=$(raw-ldflags) LDADD="-lssp_nonshared" $(freebsd_get_bmake) ${mymakeopts} || die "make libc failed" + cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp." + $(freebsd_get_bmake) ${mymakeopts} || die "make libssp failed" + cd "${WORKDIR}/lib/libthr/" || die "missing libthr" + $(freebsd_get_bmake) ${mymakeopts} || die "make libthr failed" else # Forces to use the local copy of headers as they might be outdated in # the system @@ -293,6 +299,11 @@ src_install() { INCLUDEDIR="/usr/${CTARGET}/usr/include" \ SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install ssp failed" + cd "${WORKDIR}/lib/libthr/" + $(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \ + INCLUDEDIR="/usr/${CTARGET}/usr/include" \ + SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install libthr failed" + dosym "usr/include" "/usr/${CTARGET}/sys-include" else # Set SHLIBDIR and LIBDIR for multilib |