From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SV42F-0008DL-Oz for garchives@archives.gentoo.org; Thu, 17 May 2012 16:58:46 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C601E0683; Thu, 17 May 2012 16:58:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5A3AAE0683 for ; Thu, 17 May 2012 16:58:29 +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 8847464272 for ; Thu, 17 May 2012 16:58:28 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2139) id 44AE92004B; Thu, 17 May 2012 16:58:27 +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.0-r2.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog freebsd-lib-9.0-r2.ebuild X-VCS-Directories: sys-freebsd/freebsd-lib X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier Content-Type: text/plain; charset=utf8 Message-Id: <20120517165827.44AE92004B@flycatcher.gentoo.org> Date: Thu, 17 May 2012 16:58:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b65f767a-6e83-4540-8f4f-ebaac1cde890 X-Archives-Hash: 84ab2edb12d8487c2edad29f2649f5ff aballier 12/05/17 16:58:27 Modified: ChangeLog freebsd-lib-9.0-r2.ebuild Log: factorize the way of getting the csudir =20 (Portage version: 2.2.0_alpha107/cvs/Linux x86_64) Revision Changes Path 1.121 sys-freebsd/freebsd-lib/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebs= d-lib/ChangeLog?rev=3D1.121&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebs= d-lib/ChangeLog?rev=3D1.121&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebs= d-lib/ChangeLog?r1=3D1.120&r2=3D1.121 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- ChangeLog 17 May 2012 16:25:29 -0000 1.120 +++ ChangeLog 17 May 2012 16:58:27 -0000 1.121 @@ -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= .120 2012/05/17 16:25:29 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1= .121 2012/05/17 16:58:27 aballier Exp $ + + 17 May 2012; Alexis Ballier freebsd-lib-9.0-r2.e= build: + factorize the way of getting the csudir =20 17 May 2012; Alexis Ballier freebsd-lib-9.0-r2.e= build: Factorize some code. Install all the cross-compile libraries in the sa= me 1.7 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebs= d-lib/freebsd-lib-9.0-r2.ebuild?rev=3D1.7&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebs= d-lib/freebsd-lib-9.0-r2.ebuild?rev=3D1.7&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebs= d-lib/freebsd-lib-9.0-r2.ebuild?r1=3D1.6&r2=3D1.7 Index: freebsd-lib-9.0-r2.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0= -r2.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- freebsd-lib-9.0-r2.ebuild 17 May 2012 16:25:29 -0000 1.6 +++ freebsd-lib-9.0-r2.ebuild 17 May 2012 16:58:27 -0000 1.7 @@ -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.6 2012/05/17 16:25:29 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9= .0-r2.ebuild,v 1.7 2012/05/17 16:58:27 aballier Exp $ =20 EAPI=3D2 =20 @@ -196,6 +196,14 @@ fi } =20 +get_csudir() { + if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then + echo "lib/csu/$1-elf" + else + echo "lib/csu/$1" + fi +} + src_compile() { # Does not work with GNU sed # Force BSD's sed on BSD. @@ -221,21 +229,16 @@ local machine machine=3D$(tc-arch-kernel ${CTARGET}) =20 - local csudir - if [ -d "${S}/csu/${machine}-elf" ]; then - csudir=3D"${S}/csu/${machine}-elf" - else - csudir=3D"${S}/csu/${machine}" - fi + local csudir=3D"$(get_csudir ${machine})" export RAW_LDFLAGS=3D$(raw-ldflags) - cd "${csudir}" + cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}." $(freebsd_get_bmake) ${mymakeopts} || die "make csu failed" =20 append-flags "-isystem /usr/${CTARGET}/usr/include" append-flags "-isystem ${WORKDIR}/lib/libutil" append-flags "-isystem ${WORKDIR}/lib/msun/${machine/i386/i387}" - append-flags "-B ${csudir}" - append-ldflags "-B ${csudir}" + append-flags "-B ${WORKDIR}/${csudir}" + append-ldflags "-B ${WORKDIR}/${csudir}" =20 # First compile libssp_nonshared.a and add it's path to LDFLAGS. cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libss= p." @@ -286,14 +289,7 @@ local mylibdir=3D$(get_libdir) =20 if [ "${CTARGET}" !=3D "${CHOST}" ]; then - local csudir - if [ -d "${WORKDIR}/lib/csu/$(tc-arch-kernel ${CTARGET})-elf" ]; then - csudir=3D"lib/csu/$(tc-arch-kernel ${CTARGET})-elf" - else - csudir=3D"lib/csu/$(tc-arch-kernel ${CTARGET})" - fi - - for i in "${csudir}" lib/libc lib/msun gnu/lib/libssp lib/libthr lib/l= ibutil ; do + for i in "$(get_csudir $(tc-arch-kernel ${CTARGET}))" lib/libc lib/msu= n gnu/lib/libssp lib/libthr lib/libutil ; do cd "${WORKDIR}/${i}/" || die "missing ${i}." $(freebsd_get_bmake) ${mymakeopts} DESTDIR=3D"${D}" install NO_MAN=3D= \ INCLUDEDIR=3D"/usr/${CTARGET}/usr/include" \