[gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild

["Alexis Ballier (aballier)" <aballier@gentoo.org>]

aballier    12/05/17 18:31:44

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  split out the csu bootstrapping code in its own function
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.124                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.124&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.124&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.123&r2=1.124

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- ChangeLog	17 May 2012 18:13:00 -0000	1.123
+++ ChangeLog	17 May 2012 18:31:44 -0000	1.124
@@ -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.123 2012/05/17 18:13:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.124 2012/05/17 18:31:44 aballier Exp $
+
+  17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  split out the csu bootstrapping code in its own function
 
   17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   Remove -isystem append-flags that are now useless since we pre-install the



1.10                 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.9&r2=1.10

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- freebsd-lib-9.0-r2.ebuild	17 May 2012 18:13:00 -0000	1.9
+++ freebsd-lib-9.0-r2.ebuild	17 May 2012 18:31:44 -0000	1.10
@@ -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.9 2012/05/17 18:13:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.10 2012/05/17 18:31:44 aballier Exp $
 
 EAPI=2
 
@@ -204,6 +204,16 @@
 	fi
 }
 
+bootstrap_csu() {
+	local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
+	export RAW_LDFLAGS=$(raw-ldflags)
+	cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}."
+	freebsd_src_compile
+
+	append-flags "-B ${WORKDIR}/${csudir}"
+	append-ldflags "-B ${WORKDIR}/${csudir}"
+}
+
 src_compile() {
 	# Does not work with GNU sed
 	# Force BSD's sed on BSD.
@@ -226,17 +236,9 @@
 		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
 		mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NLS="
 
-		local machine
-		machine=$(tc-arch-kernel ${CTARGET})
-
-		local csudir="$(get_csudir ${machine})"
-		export RAW_LDFLAGS=$(raw-ldflags)
-		cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}."
-		$(freebsd_get_bmake) ${mymakeopts} || die "make csu failed"
+		bootstrap_csu
 
 		append-flags "-isystem /usr/${CTARGET}/usr/include"
-		append-flags "-B ${WORKDIR}/${csudir}"
-		append-ldflags "-B ${WORKDIR}/${csudir}"
 
 		# First compile libssp_nonshared.a and add it's path to LDFLAGS.
 		cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."