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
commitdf66fb542ab43d59ffa5fdf3a5192f7a2fc07b93 (patch)
treec485ab9541c5ca181d95798546a8ad18edd42af9 /sys-freebsd/freebsd-lib
parentVersion bump. (diff)
downloadgentoo-2-df66fb542ab43d59ffa5fdf3a5192f7a2fc07b93.tar.gz
gentoo-2-df66fb542ab43d59ffa5fdf3a5192f7a2fc07b93.tar.bz2
gentoo-2-df66fb542ab43d59ffa5fdf3a5192f7a2fc07b93.zip
Set the NOSTRIPFLAG variable only once
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Diffstat (limited to 'sys-freebsd/freebsd-lib')
-rw-r--r--sys-freebsd/freebsd-lib/ChangeLog5
-rw-r--r--sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild9
2 files changed, 10 insertions, 4 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/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
}