summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-05-13 16:34:31 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-05-13 16:34:31 +0000
commit7b7214a2d133651901328643b7b06b4b777bab6d (patch)
treec799868e9000ae94b1cca84aa53cdc05888b3735 /sys-freebsd/freebsd-lib
parentkeyword ~amd64-fbsd (diff)
downloadgentoo-2-7b7214a2d133651901328643b7b06b4b777bab6d.tar.gz
gentoo-2-7b7214a2d133651901328643b7b06b4b777bab6d.tar.bz2
gentoo-2-7b7214a2d133651901328643b7b06b4b777bab6d.zip
preinstall some more headers fixing build of a cross-compiler
(Portage version: 2.2.0_alpha104/cvs/Linux x86_64)
Diffstat (limited to 'sys-freebsd/freebsd-lib')
-rw-r--r--sys-freebsd/freebsd-lib/ChangeLog5
-rw-r--r--sys-freebsd/freebsd-lib/freebsd-lib-9.0-r1.ebuild15
2 files changed, 9 insertions, 11 deletions
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 123d32eeb0ef..d515dc9ddc8a 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.113 2012/05/12 00:05:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.114 2012/05/13 16:34:31 aballier Exp $
+
+ 13 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r1.ebuild:
+ preinstall some more headers fixing build of a cross-compiler
11 May 2012; Alexis Ballier <aballier@gentoo.org> -freebsd-lib-9.0.ebuild,
-files/freebsd-lib-9.0-mancol.patch:
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r1.ebuild
index a6b0e1b5254b..8e544f0d42bd 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r1.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-r1.ebuild,v 1.3 2012/05/12 00:05:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r1.ebuild,v 1.4 2012/05/13 16:34:31 aballier Exp $
EAPI=2
@@ -282,12 +282,6 @@ src_install() {
einfo "Installing for ${CTARGET} in ${CHOST}.."
install_includes ${INCLUDEDIR}
- # Install math.h when crosscompiling, at this point
- if [ "${CHOST}" != "${CTARGET}" ]; then
- insinto "/usr/${CTARGET}/usr/include"
- doins "${S}/msun/src/math.h"
- fi
-
use crosscompile_opts_headers-only && return 0
local mylibdir=$(get_libdir)
@@ -439,13 +433,14 @@ install_includes()
INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
BINGRP="${BINGRP}" || die "install_includes() failed"
einfo "includes installed ok."
- EXTRA_INCLUDES="gnu/lib/libssp lib/librtld_db gnu/lib/libregex"
+ EXTRA_INCLUDES="gnu/lib/libssp lib/librtld_db lib/libutil lib/msun gnu/lib/libregex"
for i in $EXTRA_INCLUDES; do
einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
cd "${WORKDIR}/$i" || die
$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
- MACHINE=${MACHINE} INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
- BINGRP="${BINGRP}" || die "problem installing ssp includes."
+ MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
+ INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
+ BINGRP="${BINGRP}" || die "problem installing $i includes."
einfo "$i includes installed ok."
done
}