From: "Alexis Ballier (aballier)" <aballier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.2_rc1.ebuild
Date: Sun, 11 Aug 2013 14:26:28 +0000 (UTC) [thread overview]
Message-ID: <20130811142628.1D4422171C@flycatcher.gentoo.org> (raw)
aballier 13/08/11 14:26:28
Modified: ChangeLog freebsd-lib-9.2_rc1.ebuild
Log:
Build libsbuf and libcam multilib. Factorize some code.
(Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.197 sys-freebsd/freebsd-lib/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.197&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.197&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.196&r2=1.197
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- ChangeLog 10 Aug 2013 14:52:22 -0000 1.196
+++ ChangeLog 11 Aug 2013 14:26:27 -0000 1.197
@@ -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
1.3 sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild?r1=1.2&r2=1.3
Index: freebsd-lib-9.2_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freebsd-lib-9.2_rc1.ebuild 10 Aug 2013 14:52:22 -0000 1.2
+++ freebsd-lib-9.2_rc1.ebuild 11 Aug 2013 14:26:27 -0000 1.3
@@ -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 @@
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 @@
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 @@
# 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 @@
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 @@
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.
next reply other threads:[~2013-08-11 14:26 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-11 14:26 Alexis Ballier (aballier) [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-08-12 15:03 [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.2_rc1.ebuild Alexis Ballier (aballier)
2013-08-12 14:53 Alexis Ballier (aballier)
2013-08-11 20:31 Alexis Ballier (aballier)
2013-08-11 19:51 Alexis Ballier (aballier)
2013-08-10 14:52 Alexis Ballier (aballier)
2013-08-09 21:17 Alexis Ballier (aballier)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130811142628.1D4422171C@flycatcher.gentoo.org \
--to=aballier@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox