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

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

aballier    11/07/11 21:06:44

  Modified:             ChangeLog freebsd-lib-8.2-r1.ebuild
  Log:
  fix cross compilation, build and install libthr/libpthread when cross compiling too
  
  (Portage version: 2.2.0_alpha43/cvs/Linux x86_64)

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

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- ChangeLog	10 Jul 2011 17:47:59 -0000	1.94
+++ ChangeLog	11 Jul 2011 21:06:44 -0000	1.95
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.94 2011/07/10 17:47:59 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.95 2011/07/11 21:06:44 aballier Exp $
+
+  11 Jul 2011; Alexis Ballier <aballier@gentoo.org> freebsd-lib-8.2-r1.ebuild:
+  fix cross compilation, build and install libthr/libpthread when cross
+  compiling too
 
 *freebsd-lib-8.2-r1 (10 Jul 2011)
 



1.3                  sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild

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

Index: freebsd-lib-8.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freebsd-lib-8.2-r1.ebuild	10 Jul 2011 17:49:25 -0000	1.2
+++ freebsd-lib-8.2-r1.ebuild	11 Jul 2011 21:06:44 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild,v 1.2 2011/07/10 17:49:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild,v 1.3 2011/07/11 21:06:44 aballier Exp $
 
 EAPI=2
 
@@ -223,7 +223,7 @@
 		append-ldflags "-B ${csudir}"
 
 		# First compile libssp_nonshared.a and add it's path to LDFLAGS.
-		cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp."
+		cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
 		$(freebsd_get_bmake) ${mymakeopts} || die "make libssp failed"
 		append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
 
@@ -231,7 +231,13 @@
 		cd "${S}/libc"
 		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
 		cd "${S}/msun"
+		append-ldflags "-L${WORKDIR}/lib/libc"
+		export RAW_LDFLAGS=$(raw-ldflags)
 		LDADD="-lssp_nonshared" $(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
+		cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp."
+		$(freebsd_get_bmake) ${mymakeopts} || die "make libssp failed"
+		cd "${WORKDIR}/lib/libthr/" || die "missing libthr"
+		$(freebsd_get_bmake) ${mymakeopts} || die "make libthr failed"
 	else
 		# Forces to use the local copy of headers as they might be outdated in
 		# the system
@@ -293,6 +299,11 @@
 			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
 			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install ssp failed"
 
+		cd "${WORKDIR}/lib/libthr/"
+		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
+			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
+			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install libthr failed"
+
 		dosym "usr/include" "/usr/${CTARGET}/sys-include"
 	else
 		# Set SHLIBDIR and LIBDIR for multilib