diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-06-28 12:08:11 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-06-28 12:08:11 +0000 |
| commit | e071b28a9d7b77701452551fbf035e02f498b3d8 (patch) | |
| tree | 0aa0ae84d19aa0760ff2061dfb76ed0e3390897f /sys-freebsd | |
| parent | allow openpam for krb5 (diff) | |
| download | gentoo-2-e071b28a9d7b77701452551fbf035e02f498b3d8.tar.gz gentoo-2-e071b28a9d7b77701452551fbf035e02f498b3d8.tar.bz2 gentoo-2-e071b28a9d7b77701452551fbf035e02f498b3d8.zip | |
fix cross compilation
(Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'sys-freebsd')
| -rw-r--r-- | sys-freebsd/freebsd-lib/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/freebsd-lib-9.1-r9.ebuild | 22 |
2 files changed, 16 insertions, 11 deletions
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog index e6eadb830bc5..a49645ce0062 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-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.188 2013/06/27 23:07:13 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.189 2013/06/28 12:08:11 aballier Exp $ + + 28 Jun 2013; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.1-r9.ebuild: + fix cross compilation 27 Jun 2013; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.1-r9.ebuild: cosmetics diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r9.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r9.ebuild index 91c71349d980..4903b682bc00 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r9.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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-r9.ebuild,v 1.3 2013/06/27 23:07:13 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r9.ebuild,v 1.4 2013/06/28 12:08:11 aballier Exp $ EAPI=5 @@ -465,11 +465,18 @@ wrap_header_end() { } do_install() { - INCLUDEDIR="/usr/include" + if is_crosscompile ; then + INCLUDEDIR="/usr/${CTARGET}/usr/include" + else + INCLUDEDIR="/usr/include" + fi + dodir ${INCLUDEDIR} CTARGET="${CHOST}" \ install_includes ${INCLUDEDIR} + is_crosscompile && use crosscompile_opts_headers-only && return 0 + for i in $(get_subdirs) ; do einfo "Installing in ${i}..." cd "${WORKDIR}/${i}/" || die "missing ${i}." @@ -513,11 +520,9 @@ do_install() { src_install() { if is_crosscompile ; then einfo "Installing for ${CTARGET} in ${CHOST}.." - INCLUDEDIR="/usr/${CTARGET}/usr/include" - dodir ${INCLUDEDIR} - install_includes ${INCLUDEDIR} - - use crosscompile_opts_headers-only && return 0 + # From this point we need to force: get stripped with the correct tools, + # get tc-arch-kernel to return the right value, etc. + export CHOST=${CTARGET} mymakeopts="${mymakeopts} NO_MAN= \ INCLUDEDIR=/usr/${CTARGET}/usr/include \ @@ -527,9 +532,6 @@ src_install() { dosym "usr/include" "/usr/${CTARGET}/sys-include" do_install - # This is to get it stripped with the correct tools, otherwise it gets - # stripped with the host strip. - export CHOST=${CTARGET} return 0 else export STRIP_MASK="*/usr/lib*/*crt*.o" |