summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Beierlein <tomjbe@gentoo.org>2010-08-27 09:39:28 +0000
committerThomas Beierlein <tomjbe@gentoo.org>2010-08-27 09:39:28 +0000
commitadcf87d733586fedae24cfb455bcc8d387d781d4 (patch)
treeb51dee7c7fd72d487aa1ad2bab7f3277b9ee9123 /sci-electronics/balsa
parentRespect LDFLAGS wrt bug 334781. Thanks to Diego for the report. Drop old. (diff)
downloadgentoo-2-adcf87d733586fedae24cfb455bcc8d387d781d4.tar.gz
gentoo-2-adcf87d733586fedae24cfb455bcc8d387d781d4.tar.bz2
gentoo-2-adcf87d733586fedae24cfb455bcc8d387d781d4.zip
Respect LDFLAGS wrt bug #333855. Thanks for reporting Diego.
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'sci-electronics/balsa')
-rw-r--r--sci-electronics/balsa/ChangeLog6
-rw-r--r--sci-electronics/balsa/balsa-4.0.ebuild3
-rw-r--r--sci-electronics/balsa/files/4.0-ldflags.patch11
3 files changed, 18 insertions, 2 deletions
diff --git a/sci-electronics/balsa/ChangeLog b/sci-electronics/balsa/ChangeLog
index e6d9ea02417f..7e2a8b9b4ea6 100644
--- a/sci-electronics/balsa/ChangeLog
+++ b/sci-electronics/balsa/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-electronics/balsa
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/balsa/ChangeLog,v 1.14 2010/06/24 17:26:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/balsa/ChangeLog,v 1.15 2010/08/27 09:39:28 tomjbe Exp $
+
+ 27 Aug 2010; Thomas Beierlein <tomjbe@gentoo.org>
+ +files/4.0-ldflags.patch, balsa-4.0.ebuild:
+ Respect LDFLAGS wrt bug #333855. Thanks for reporting Diego.
*balsa-4.0 (24 Jun 2010)
diff --git a/sci-electronics/balsa/balsa-4.0.ebuild b/sci-electronics/balsa/balsa-4.0.ebuild
index 66f1e4cb9e3e..8f2f23451b7c 100644
--- a/sci-electronics/balsa/balsa-4.0.ebuild
+++ b/sci-electronics/balsa/balsa-4.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/balsa/balsa-4.0.ebuild,v 1.1 2010/06/24 17:26:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/balsa/balsa-4.0.ebuild,v 1.2 2010/08/27 09:39:28 tomjbe Exp $
EAPI="1"
@@ -45,6 +45,7 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}"/${PV}-libdir.patch
epatch "${FILESDIR}"/${PV}-datadir.patch
+ epatch "${FILESDIR}"/${PV}-ldflags.patch
eautoreconf
sed -i -e "s:\(DEFAULT_INCLUDES = \)\(.*\):\1-I"${S}"/src/libs/ \2/:" "${WORKDIR}"/balsa-sim-verilog-${PV}/libs/Makefile.in
sed -i -e 's/ $(bindir)/ $(DESTDIR)$(bindir)/' "${S}"/bin/Makefile.in
diff --git a/sci-electronics/balsa/files/4.0-ldflags.patch b/sci-electronics/balsa/files/4.0-ldflags.patch
new file mode 100644
index 000000000000..74df6c075c29
--- /dev/null
+++ b/sci-electronics/balsa/files/4.0-ldflags.patch
@@ -0,0 +1,11 @@
+--- bin/balsa-make-builtin-lib.in.orig 2010-08-27 11:14:54.000000000 +0200
++++ bin/balsa-make-builtin-lib.in 2010-08-27 11:15:09.000000000 +0200
+@@ -89,7 +89,7 @@
+ # Test compilation
+ if [ -n "${DOCOMPILE}" ]; then
+ if ${LIBTOOL} --mode=compile @CC@ @CFLAGS@ -c ${INCLUDES} -o ${LIBNAME}.o $* &&
+- ${LIBTOOL} --mode=link @CC@ @CFLAGS@ -o ${LIBNAME}.la -c ${INCLUDES} ${LIBNAME}.lo -rpath ${INSTALLDIR} -module
++ ${LIBTOOL} --mode=link @CC@ @CFLAGS@ @LDFLAGS@ -o ${LIBNAME}.la -c ${INCLUDES} ${LIBNAME}.lo -rpath ${INSTALLDIR} -module
+ then
+ :
+ else