summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-05-18 01:31:08 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-05-18 01:31:08 +0000
commit385a61d6a8983d5e26b830760e3a404d22544f24 (patch)
tree691df4694c312d77b974961d8eea58fd802ca2e6 /sys-freebsd
parentVersion bump. (diff)
downloadhistorical-385a61d6a8983d5e26b830760e3a404d22544f24.tar.gz
historical-385a61d6a8983d5e26b830760e3a404d22544f24.tar.bz2
historical-385a61d6a8983d5e26b830760e3a404d22544f24.zip
Set the NOSTRIPFLAG variable only once
Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64
Diffstat (limited to 'sys-freebsd')
-rw-r--r--sys-freebsd/freebsd-lib/ChangeLog5
-rw-r--r--sys-freebsd/freebsd-lib/Manifest10
-rw-r--r--sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild9
3 files changed, 15 insertions, 9 deletions
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index a124cd8b89a0..c4425eaa0df7 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -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.128 2012/05/17 20:03:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.129 2012/05/18 01:31:08 aballier Exp $
+
+ 18 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+ Set the NOSTRIPFLAG variable only once
17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
Generate the libc ldscript for the cross-compiled library too.
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 7669c43cbfbc..657cb2e36937 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 13579 RMD160 4550844f2daae94039bbc9a509b9856821bf497e SHA1 b49d08fa4955252c29020f46a154fd5fbac2f7d1 SHA256 edceba5d74486513eff259c52ef7a6a00507065c11124a135ce21e64d14e992d
-MISC ChangeLog 27325 RMD160 15bd2ab5c3fadc835f3b85e20ad1af5b8b42343b SHA1 4f20a74a3088ee73ec19945f83304746dd746fee SHA256 aca042980ade6e025c2fb4519c0cf779eaa9d9e2d704e2c42fd4f8f2b8cb50c0
+EBUILD freebsd-lib-9.0-r2.ebuild 13666 RMD160 499501b72a1732faea5ec7a3fa84bdebb9afb92c SHA1 16e1b44cbd54b3c41e3f87c644e015ce42513292 SHA256 2238b73b4d0904ea798052bb42c13226743ab1c9d28be86d7807f893e6c4af10
+MISC ChangeLog 27446 RMD160 c9bbda73fcba426027cff65729d3a0b09bb293cf SHA1 970241f73d89f554cf8cb929fec2fadeeda56111 SHA256 ec3c47e0ef6331960c5a9b13a2406840ab4b3c82015a2c479b6f1368eebae60f
MISC metadata.xml 410 RMD160 f5d6157462d32d3397c8f69ed4d1ff37f2bd5165 SHA1 067425a31e0d87fc9e911ae203cce0fced8da77d SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEARECAAYFAk+1WXoACgkQvFcC4BYPU0oimwCgu3sHvaZdZ4Lf4bJikj2xDTnF
-rmEAoLMQ/XhH32a8HqXVQlSla0CBvx/6
-=c/yL
+iEYEARECAAYFAk+1pmIACgkQvFcC4BYPU0rwyQCeJMX5YqdiMrWGodD1wblkMSfN
+eE8AoI0KDksvkMgT0nL7XCXonUmntPMJ
+=g/vI
-----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 b2cbd6f623f4..07503ed28a0c 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.14 2012/05/17 20:03:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.15 2012/05/18 01:31:08 aballier Exp $
EAPI=2
@@ -217,7 +217,7 @@ bootstrap_csu() {
# Compile libssp_nonshared.a and add it's path to LDFLAGS.
bootstrap_libssp_nonshared() {
cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
- NOFLAGSTRIP=yes freebsd_src_compile
+ freebsd_src_compile
append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
}
@@ -237,7 +237,10 @@ src_compile() {
# Bug #270098
append-flags $(test-flags -fno-strict-aliasing)
+ # strip flags and do not do it later, we only add safe, and in fact
+ # needed flags after all
strip-flags
+ export NOFLAGSTRIP=yes
if [ "${CTARGET}" != "${CHOST}" ]; then
export YACC='yacc -by'
CHOST=${CTARGET} tc-export CC LD CXX RANLIB
@@ -268,7 +271,7 @@ src_compile() {
# Everything is now setup, build it!
for i in ${SUBDIRS} ; do
cd "${WORKDIR}/${i}/" || die "missing ${i}."
- NOFLAGSTRIP=yes LDADD="-lssp_nonshared" freebsd_src_compile || die "make ${i} failed"
+ LDADD="-lssp_nonshared" freebsd_src_compile || die "make ${i} failed"
done
}