summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-05-18 17:38:01 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-05-18 17:38:01 +0000
commitd838caa5fd3db670d70ec7660474475ddc87b2ff (patch)
treec961fc484d924770e6d8e780c93a679c251ff79f /sys-freebsd
parentremove old (diff)
downloadhistorical-d838caa5fd3db670d70ec7660474475ddc87b2ff.tar.gz
historical-d838caa5fd3db670d70ec7660474475ddc87b2ff.tar.bz2
historical-d838caa5fd3db670d70ec7660474475ddc87b2ff.zip
factorize the bootstrapping code between cross and native builds.
Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64
Diffstat (limited to 'sys-freebsd')
-rw-r--r--sys-freebsd/freebsd-lib/ChangeLog5
-rw-r--r--sys-freebsd/freebsd-lib/Manifest10
-rw-r--r--sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild25
3 files changed, 24 insertions, 16 deletions
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 93138e42f6d2..cbca948338cb 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.134 2012/05/18 16:37:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.135 2012/05/18 17:38:01 aballier Exp $
+
+ 18 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+ factorize the bootstrapping code between cross and native builds.
18 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
bootstrap the csu with USE=build too
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 6b50a212daa2..9ed17312942d 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -61,13 +61,13 @@ EBUILD freebsd-lib-7.2-r1.ebuild 12021 RMD160 83fc0d2ee7e5ff037ae27358d0b345fc28
EBUILD freebsd-lib-8.0.ebuild 14623 RMD160 3194aa0ab5fda28db1db05b4449d5889251cedc1 SHA1 bbddaa53f36296b2a635c459868cd56fd965de81 SHA256 ba8328339f7c487617d8e1c8754d91ccae38a15073a92b847299aa5e8dfe68da
EBUILD freebsd-lib-8.2-r1.ebuild 15691 RMD160 24faa71ebac5ed9935f52e8e2036cf2e08632ccd SHA1 a17c950b703f3ec5c4bc094d99c1ea12839855f5 SHA256 e5f57f8252c839e5e16dcb1aa29aacaba09c89d2d443a6b159fcad9210834053
EBUILD freebsd-lib-9.0-r1.ebuild 15966 RMD160 6b7ae4425b437ba43df030f8a8b530b796878aa4 SHA1 19505d0f2a215ed6c13f2d457871cd834a103119 SHA256 c86b9b4f42fd1339ea81858fe430d3b34c6ee8a663b14369d7f957769951b7ae
-EBUILD freebsd-lib-9.0-r2.ebuild 13761 RMD160 f9007fda4705d7f44f1f28e337dd1299bb08ef97 SHA1 d7f1e0475f6b3e4253d9fff913eda76f37fd405c SHA256 8400abaf0e0421d23e2f06fb28606721038ee1a2473b1d951f438f1f40139867
-MISC ChangeLog 28212 RMD160 82ec9d4eed68856da51761d1fb9c0a089f36c574 SHA1 2296e423cb7c202314cf4e9b91a908b8cafbc4b3 SHA256 b49c959ff5c796cda6e939c9a3aec6826e357b231f9340902cf3e5b780f6deeb
+EBUILD freebsd-lib-9.0-r2.ebuild 13958 RMD160 99e2c18e1c0f122b93b2f7d7784819b13416c668 SHA1 99586194c5277c6b94a287f008bfa56e2b8088bd SHA256 84e8e7d0e85ca0d2b3e4cd9edc4d99efa207cda86e138653072c307139aff3c7
+MISC ChangeLog 28360 RMD160 420b0da496aace3d47501ec304349d6905e06e02 SHA1 741bb10abd5d3b86ec55d40b1061ea6f7cf64b1c SHA256 e3f08d1199c365b07dbf800e456d22732029504a9bfa335f6d49039c65ce1d46
MISC metadata.xml 410 RMD160 f5d6157462d32d3397c8f69ed4d1ff37f2bd5165 SHA1 067425a31e0d87fc9e911ae203cce0fced8da77d SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEARECAAYFAk+2eswACgkQvFcC4BYPU0ojUQCfdk/v1n34rwBqVL/bRb5oN/MX
-L+8AnRrIWg+EQytxVdGgBhI1JJ98jvoF
-=2zn2
+iEYEARECAAYFAk+2iP8ACgkQvFcC4BYPU0rmzgCfVyOlNgjIv17I0wzuIUq4SvBK
+H7EAoLqSMtQxigv10eF0P4IZem1T8SBe
+=6ljP
-----END PGP SIGNATURE-----
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 05ab77b75d19..19ee32666836 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.20 2012/05/18 16:37:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.21 2012/05/18 17:38:01 aballier Exp $
EAPI=2
@@ -225,6 +225,18 @@ NON_NATIVE_SUBDIRS="lib/libc lib/msun gnu/lib/libssp lib/libthr lib/libutil"
# Subdirs for a native build:
NATIVE_SUBDIRS="lib gnu/lib/libssp gnu/lib/libregex"
+# Do we need to bootstrap the csu and libssp_nonshared?
+need_bootstrap() {
+ [ "${CTARGET}" != "${CHOST}" ] || use build
+}
+
+# Bootstrap the core libraries and setup the flags so that the other parts can
+# build against it.
+do_bootstrap() {
+ bootstrap_csu
+ bootstrap_libssp_nonshared
+}
+
src_compile() {
# Does not work with GNU sed
# Force BSD's sed on BSD.
@@ -251,23 +263,16 @@ src_compile() {
mymakeopts="${mymakeopts} NLS="
append-flags "-isystem /usr/${CTARGET}/usr/include"
append-ldflags "-L${WORKDIR}/lib/libc"
-
- bootstrap_csu
-
- bootstrap_libssp_nonshared
-
SUBDIRS="${NON_NATIVE_SUBDIRS}"
else
# Forces to use the local copy of headers with USE=build as they might
# be outdated in the system. Assume they are fine otherwise.
use build && append-flags "-isystem '${WORKDIR}/include_proper'"
-
- use build && bootstrap_csu
- use build && bootstrap_libssp_nonshared
-
SUBDIRS="${NATIVE_SUBDIRS}"
fi
+ need_bootstrap && do_bootstrap
+
export RAW_LDFLAGS=$(raw-ldflags)
# Everything is now setup, build it!