summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-08-11 14:26:35 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-08-11 14:26:35 +0000
commit69d813bd16a2ad7d661b6154eac80a6cb13d925d (patch)
tree36f9878cf0f836c35ca8dbd1f17bda7d9c93d275 /sys-freebsd
parentConvert to multilib. Do not build executables for the static libs build, drop... (diff)
downloadhistorical-69d813bd16a2ad7d661b6154eac80a6cb13d925d.tar.gz
historical-69d813bd16a2ad7d661b6154eac80a6cb13d925d.tar.bz2
historical-69d813bd16a2ad7d661b6154eac80a6cb13d925d.zip
Build libsbuf and libcam multilib. Factorize some code.
Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64 Manifest-Sign-Key: 0x160F534A
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.2_rc1.ebuild46
3 files changed, 28 insertions, 33 deletions
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index fd19ab5f0a60..8c5a1c8840e9 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.196 2013/08/10 14:52:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.197 2013/08/11 14:26:27 aballier Exp $
+
+ 11 Aug 2013; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.2_rc1.ebuild:
+ Build libsbuf and libcam multilib. Factorize some code.
10 Aug 2013; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.2_rc1.ebuild:
fix building of a cross libc
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 1f3e5860866d..7ef2eed200ec 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -60,13 +60,13 @@ DIST freebsd-usbin-9.2_rc1.tar.bz2 2867186 SHA256 e96c38c632e1ff4a98a922709d92c9
EBUILD freebsd-lib-8.2-r1.ebuild 15816 SHA256 0d7ffdafe52db8b8c0c13741d15cf5ef32d808179bcfd05915afc4b5557a618a SHA512 2623c08ceb9f09d655d742860ca66f26669fb4ac5674e2b36fbe5a737580a16f404ff5abacaa42dd61a5b104805b29cc83f5c37b17f6c94865772cae169dea3a WHIRLPOOL 9b5780f01ca7980b456449fd8bec36e681ee6fb491839d6b7d7655efe31b57c000214e031c389b58e465349a845846860a1d24e8104ea9692bea37a080d7f8af
EBUILD freebsd-lib-9.1-r10.ebuild 18642 SHA256 41a975236bb1e408812f34298e7397203df33afc6f0d5094aa0ebe42c7eb145f SHA512 fba0026b631d722c69a7fb8d5effcbee66c81970fa971b79a430b2e6657dfa4eea8407bdbf55f737f93d212daf9298320adb296bc58b9c0de141ecc07a926f27 WHIRLPOOL cb575e984e63b133ea9be545ff510183199104b091b742818af3a7c49801b8307d539a9b26e0253fb1d3dfe774c7f76ec12333ae82672bc5d31506a7d9195dd7
EBUILD freebsd-lib-9.1-r11.ebuild 18835 SHA256 54fadb822046b0172afd21e33d10f4541d68a72dff03245ca34e55f43b1118f4 SHA512 d8163b6e08921ac2e8635df670068a1ec2c5fce2136bee33327d5b89fd5d062bc5c505c6c71738dd9c080f1c18ce1744bdb7a6a398eee0b549b0cd37f3eef99c WHIRLPOOL 2838eaf36618e0770b630a174e34aa5d7647758e6a0503a27a7f58883f21d277c5fed003526c068cb9d7358ee496bc09a079f533c2f9976c3233da07f1f121df
-EBUILD freebsd-lib-9.2_rc1.ebuild 18639 SHA256 526464332a8849e0acdcc3c25ea5fddce5bc5f9dce624dfc704a94a03c284872 SHA512 f4df802c964e55e585414b0c337d26d6fa5e2ea4445fcded10c9cd0f91d4e9583dfdae02dbbf5e61d5e814e2b62a52751368c2faf6427fb50608120816649a17 WHIRLPOOL c6c9888a77fced684f279c00b1ad04bcaeab8ab7efe8f61c744bed463fc9477681bda825149291ecdc1f4b3ebbf3e09a0c77a42ee9f80f7bef740507cf92976f
-MISC ChangeLog 40228 SHA256 558e691a002ddf931168c0c57115d87fa646cfd2ffc5d8d9882cbc0707c75376 SHA512 7525bbac130402494c79548e2b62cced3a034e724ed3818e4a34f0a1a84f91c23ed842c6f0dc88cb49e82a0c77bb419d1e873a84cc1490bac0bd9123521d3fc5 WHIRLPOOL 11a2831b1c20e5e2e09b334e51a929332ed5e543b76954f69680245516869d87ad73552a8e880411a50bb8643cc40f3976344b713835a2c90baa0287f814a9b1
+EBUILD freebsd-lib-9.2_rc1.ebuild 18252 SHA256 b17e2af0376fb1e1902404aef0fdf2d6deac1fb38b3abb048ea6871069db7f46 SHA512 f3deeb4dfd36a9ae700d7240ada8d3039557ebdfe80e9d44c828cb94a0436ef757c5a9b3a534a40f326311ba4f689be3eef1f15fc2e3b742583a479bb9d3e0cb WHIRLPOOL a9e6663113e51a6578da98044f74db4692693ef9e037c9c5b138667bb150e4a38e8b2aaa7aef5a033f7bdd1369138bcb2923c36083861856d257f7ad685c32ee
+MISC ChangeLog 40367 SHA256 6a22b9362c4c050550961181cc017c7abed70491c4a7dcbf3484bcef72e7ce97 SHA512 3429e719aec79f92c066c53a8eee9fef837ee482935f2eb2ea4c8ed1441c39ed93d12cea089e03ea6466ee5a5d17287e3349a529e36f89222833f57913a0e6d9 WHIRLPOOL 2f07a0398b7e34c31e209dc8ef629179bccbd2e0ed45ccf7fcd74b38f87c5e0d0b665176d7599a344840f847625926e08cf444b359c62040fa5b9db2ba6f9da3
MISC metadata.xml 410 SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246 SHA512 de2a427cd8fcc2c0d7c0a1821f4cc916a280d9c0e21d83fdb7c35d110b48e96854baffc7d469e3461c2a6ee81eaec14d105c45cafbd3aaa37100a525bc60b7af WHIRLPOOL 3b2f587e647dafdb68bdb147bb0d5fecea0e728b52eabb61deb2623641117be6ac0871405666d7616ae1d60eaacf0b621cba8175dca463e9344ad83a4daf5865
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iEYEAREIAAYFAlIGU6gACgkQvFcC4BYPU0rG+QCglEYSoQgls1TN64x82PH4375O
-lQMAoIXx/EVVGFbb1wLsn+eVAzUpZaVK
-=yOrn
+iEYEAREIAAYFAlIHnxUACgkQvFcC4BYPU0q5SQCgnlIv2n0jgZTwdPakO4Pr9Pa9
+tskAoLvnMIlSvvUkQbfXGLAnwuwLMoJn
+=iDnn
-----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild
index 8c9b8526891d..e61e0ad24e9b 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.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.2_rc1.ebuild,v 1.2 2013/08/10 14:52:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild,v 1.3 2013/08/11 14:26:27 aballier Exp $
EAPI=5
@@ -192,6 +192,14 @@ src_prepare() {
fi
}
+bootstrap_lib() {
+ for i ; do
+ cd "${WORKDIR}/${i}" || die "missing ${i}"
+ freebsd_src_compile
+ append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/${i}"
+ done
+}
+
get_csudir() {
if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then
echo "lib/csu/$1-elf"
@@ -203,14 +211,13 @@ get_csudir() {
bootstrap_csu() {
local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
export RAW_LDFLAGS=$(raw-ldflags)
- cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}."
- freebsd_src_compile
+ bootstrap_lib "${csudir}"
CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
- cd "${WORKDIR}/gnu/lib/csu" || die
- freebsd_src_compile
+ bootstrap_lib "gnu/lib/csu"
+
cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
for i in *.So ; do
ln -s $i ${i%.So}S.o
@@ -221,36 +228,20 @@ bootstrap_csu() {
# 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${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
+ bootstrap_lib "gnu/lib/libssp/libssp_nonshared"
export LDADD="-lssp_nonshared"
}
-bootstrap_libc() {
- cd "${WORKDIR}/lib/libc" || die
- freebsd_src_compile
- append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libc"
-}
-
bootstrap_libgcc() {
- cd "${WORKDIR}/lib/libcompiler_rt" || die
- freebsd_src_compile
+ bootstrap_lib "lib/libcompiler_rt"
cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt" || die
ln -s libcompiler_rt.a libgcc.a || die
- append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt"
-
- bootstrap_libc
- cd "${WORKDIR}/gnu/lib/libgcc" || die
- freebsd_src_compile
- append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libgcc"
+ bootstrap_lib "lib/libc" "gnu/lib/libgcc"
}
bootstrap_libthr() {
- cd "${WORKDIR}/lib/libthr" || die
- freebsd_src_compile
- append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr"
+ bootstrap_lib "lib/libthr"
cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr" || die
ln -s libthr.so libpthread.so
}
@@ -260,7 +251,7 @@ bootstrap_libthr() {
CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt"
# What to build for non-default ABIs.
-NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt"
+NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt lib/libsbuf lib/libcam"
# Subdirs for a native build:
NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc"
@@ -312,9 +303,10 @@ do_bootstrap() {
fi
bootstrap_csu
bootstrap_libssp_nonshared
- is_crosscompile && bootstrap_libc
+ is_crosscompile && bootstrap_lib "lib/libc"
is_crosscompile || is_native_abi || bootstrap_libgcc
is_native_abi || bootstrap_libthr
+ is_native_abi || bootstrap_lib "lib/libsbuf"
}
# Compile it. Assume we have the toolchain setup correctly.