Set the ssp_nonshared LDADD in its bootstrapping function. Add it only with USE=build, assume we have the ldscript in place if not.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

3 files changed, 14 insertions, 9 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index b9687a07363e..53d37bf162e4 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,10 @@
 # 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.131 2012/05/18 01:48:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.132 2012/05/18 02:03:29 aballier Exp $
+
+  18 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  Set the ssp_nonshared LDADD in its bootstrapping function. Add it only with
+  USE=build, assume we have the ldscript in place if not.
 
   18 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   Preinstall headers only with USE=build
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index d038e39a84ef..35ecf6e4d4ef 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -61,13 +61,13 @@ EBUILD freebsd-lib-7.2-r1.ebuild 12021 RMD160 83fc0d2ee7e5ff037ae27358d0b345fc28
 EBUILD freebsd-lib-8.0.ebuild 14623 RMD160 3194aa0ab5fda28db1db05b4449d5889251cedc1 SHA1 bbddaa53f36296b2a635c459868cd56fd965de81 SHA256 ba8328339f7c487617d8e1c8754d91ccae38a15073a92b847299aa5e8dfe68da
 EBUILD freebsd-lib-8.2-r1.ebuild 15691 RMD160 24faa71ebac5ed9935f52e8e2036cf2e08632ccd SHA1 a17c950b703f3ec5c4bc094d99c1ea12839855f5 SHA256 e5f57f8252c839e5e16dcb1aa29aacaba09c89d2d443a6b159fcad9210834053
 EBUILD freebsd-lib-9.0-r1.ebuild 15966 RMD160 6b7ae4425b437ba43df030f8a8b530b796878aa4 SHA1 19505d0f2a215ed6c13f2d457871cd834a103119 SHA256 c86b9b4f42fd1339ea81858fe430d3b34c6ee8a663b14369d7f957769951b7ae
-EBUILD freebsd-lib-9.0-r2.ebuild 13507 RMD160 779d5433e2f55abf1603af79eba578f4747550fe SHA1 cb83c1f5e5d2eac343134b0ec6ee9e08daea89c9 SHA256 1b8836f75661591a884c711fa54ddc7c22cc2a25dd0aac8e2beb3aaf164dc793
-MISC ChangeLog 27708 RMD160 73f0465aa36e54641a0395cea7c104f24db4fadd SHA1 5c429dd05ce73bd9bdd42c737f6c0db037f7b5d0 SHA256 6edc5f5716bb4ca03279f4c3997e9f5d2a29513bdbe2be58814fa4394c1988db
+EBUILD freebsd-lib-9.0-r2.ebuild 13528 RMD160 175a7c4f7db8f10e5c012ba34107cc7c9a947dc2 SHA1 9ab5bae1d37a6d4d5b1a2686bb37f8a3556c27d2 SHA256 4cef3c63f453cfd0ec6c499b537d51c53ed70a411314bf983f4f92116169e4e2
+MISC ChangeLog 27924 RMD160 2928f9458f3aaebc3990f43673ce1d4dc9f49d3f SHA1 676d1ac7d9c3f4424f0cd009e91b3fec8b866ff1 SHA256 33efc6a39ece36c1fa6629dbae6f3f702d338138e53e8f98fcad5ab8a869ffd1
 MISC metadata.xml 410 RMD160 f5d6157462d32d3397c8f69ed4d1ff37f2bd5165 SHA1 067425a31e0d87fc9e911ae203cce0fced8da77d SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+1qlYACgkQvFcC4BYPU0q40gCgu/JIXBfmEbX+7Hjt044gzANj
-nQkAn1MrBeL/UWf4qcXUCfKOD6IN6qAL
-=+aMi
+iEYEARECAAYFAk+1rfYACgkQvFcC4BYPU0rxlgCeIGThiZZTJqivsDlO1q2+oH6m
+96EAoJOXMi0JemPlYNzA8J4NewzJONlz
+=+aJ9
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild
index 3dfec3838ddb..51a96623b363 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild
@@ -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.17 2012/05/18 01:48:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.18 2012/05/18 02:03:29 aballier Exp $
 
 EAPI=2
 
@@ -215,6 +215,7 @@ bootstrap_libssp_nonshared() {
 	cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
 	freebsd_src_compile
 	append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
+	export LDADD="-lssp_nonshared"
 }
 
 src_compile() {
@@ -254,7 +255,7 @@ src_compile() {
 		# be outdated in the system. Assume they are fine otherwise.
 		use build && append-flags "-isystem '${WORKDIR}/include_proper'"
 
-		bootstrap_libssp_nonshared
+		use build && bootstrap_libssp_nonshared
 
 		SUBDIRS="lib gnu/lib/libssp gnu/lib/libregex"
 	fi
@@ -264,7 +265,7 @@ src_compile() {
 	# Everything is now setup, build it!
 	for i in ${SUBDIRS} ; do
 		cd "${WORKDIR}/${i}/" || die "missing ${i}."
-		LDADD="-lssp_nonshared" freebsd_src_compile || die "make ${i} failed"
+		freebsd_src_compile || die "make ${i} failed"
 	done
 }