From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E1FF91381F3 for ; Sun, 11 Aug 2013 14:26:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 08D6DE0B80; Sun, 11 Aug 2013 14:26:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 894ACE0B80 for ; Sun, 11 Aug 2013 14:26:30 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6D9FD335E2B for ; Sun, 11 Aug 2013 14:26:29 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2139) id 1D4422171C; Sun, 11 Aug 2013 14:26:28 +0000 (UTC) From: "Alexis Ballier (aballier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, aballier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.2_rc1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog freebsd-lib-9.2_rc1.ebuild X-VCS-Directories: sys-freebsd/freebsd-lib X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130811142628.1D4422171C@flycatcher.gentoo.org> Date: Sun, 11 Aug 2013 14:26:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 69bfac4b-6a99-4257-acf3-87e4cea902a8 X-Archives-Hash: 0cc5ecada83501a91b07438600690f33 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 freebsd-lib-9.2_rc1.ebuild: + Build libsbuf and libcam multilib. Factorize some code. 10 Aug 2013; Alexis Ballier 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.