summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2012-11-12 02:47:14 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2012-11-12 02:47:14 +0000
commit663e9d1fbc1f631b445664062e4c35ecd36bbce9 (patch)
treed967ffc97ea368b3d0a3457b937d230a9ec9ee52 /sci-libs
parentVersion bump (diff)
downloadgentoo-2-663e9d1fbc1f631b445664062e4c35ecd36bbce9.tar.gz
gentoo-2-663e9d1fbc1f631b445664062e4c35ecd36bbce9.tar.bz2
gentoo-2-663e9d1fbc1f631b445664062e4c35ecd36bbce9.zip
Proper static libs removal
(Portage version: 2.2.01.21313-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/cdf/ChangeLog5
-rw-r--r--sci-libs/cdf/cdf-3.4.1.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/sci-libs/cdf/ChangeLog b/sci-libs/cdf/ChangeLog
index e8126603a88b..f08068ffd17c 100644
--- a/sci-libs/cdf/ChangeLog
+++ b/sci-libs/cdf/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-libs/cdf
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cdf/ChangeLog,v 1.23 2012/08/03 17:15:34 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cdf/ChangeLog,v 1.24 2012/11/12 02:47:14 bicatali Exp $
+
+ 12 Nov 2012; Sébastien Fabbro <bicatali@gentoo.org> cdf-3.4.1.ebuild:
+ Proper static libs removal
*cdf-3.4.1 (03 Aug 2012)
diff --git a/sci-libs/cdf/cdf-3.4.1.ebuild b/sci-libs/cdf/cdf-3.4.1.ebuild
index 07b4e71f65ee..c0ba1e0647cd 100644
--- a/sci-libs/cdf/cdf-3.4.1.ebuild
+++ b/sci-libs/cdf/cdf-3.4.1.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/sci-libs/cdf/cdf-3.4.1.ebuild,v 1.1 2012/08/03 17:15:34 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cdf/cdf-3.4.1.ebuild,v 1.2 2012/11/12 02:47:14 bicatali Exp $
EAPI=4
inherit eutils toolchain-funcs multilib versionator java-pkg-opt-2
@@ -74,9 +74,9 @@ src_compile() {
|| die "compiling java lib failed"
$(tc-getCC) \
${LDFLAGS} \
- -L${CDF_LIB} -lcdf -lm \
-shared cdfNativeLibrary.o \
-Wl,-soname=libcdfNativeLibrary.so.${PV_SO} \
+ -L${CDF_LIB} -lcdf -lm \
-o libcdfNativeLibrary.so.${PV_SO} \
|| die "linking java lib failed"
fi
@@ -95,7 +95,7 @@ src_install() {
SHAREDEXT=so.${PV_SO} \
install
dosym libcdf.so.${PV_SO} /usr/$(get_libdir)/libcdf.so
- use static-libs && rm -f "${ED}"/usr/$(get_libdir)/libcdf.a
+ use static-libs || rm "${ED}"/usr/$(get_libdir)/libcdf.a
dodoc Release.notes CHANGES.txt Welcome.txt
doenvd "${FILESDIR}"/50cdf