Fix build error. see #300401.

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

3 files changed, 36 insertions, 3 deletions

diff --git a/dev-java/fec/ChangeLog b/dev-java/fec/ChangeLog
index 06e675a1e084..7905d42b917e 100644
--- a/dev-java/fec/ChangeLog
+++ b/dev-java/fec/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/fec
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fec/ChangeLog,v 1.8 2010/01/17 17:56:26 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fec/ChangeLog,v 1.9 2010/02/26 12:24:29 ali_bush Exp $
+
+  26 Feb 2010; Alistair Bush <ali_bush@gentoo.org> fec-1.0.4.ebuild,
+  +files/fec-1.0.4-soname.patch:
+  Fix build error. see #300401.
 
   17 Jan 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> fec-1.0.4.ebuild:
   Add -fPIC for amd64 ARCH too, bug 301296
diff --git a/dev-java/fec/fec-1.0.4.ebuild b/dev-java/fec/fec-1.0.4.ebuild
index 1486d91311f0..f30cacd70faf 100644
--- a/dev-java/fec/fec-1.0.4.ebuild
+++ b/dev-java/fec/fec-1.0.4.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/dev-java/fec/fec-1.0.4.ebuild,v 1.2 2010/01/17 17:56:26 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fec/fec-1.0.4.ebuild,v 1.3 2010/02/26 12:24:29 ali_bush Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -29,7 +29,12 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}" || die
 	sed -i -e 's/build.compiler=jikes/#build.compiler=jikes/g' build.properties || die
+	sed -i -e 's/test.lib/lib/g' build.properties || die
 	epatch "${FILESDIR}"/${P}-libfec8path.patch
+	pushd src/csrc > /dev/null
+	epatch "${FILESDIR}/${P}-soname.patch"
+	popd > /dev/null
+
 	eant clean
 	cd lib || die
 	rm -v *.jar || die
@@ -46,9 +51,11 @@ src_compile() {
 	java-pkg-2_src_compile
 	cd "${S}"/src/csrc
 	(use amd64 || use hardened ) && append-flags -fPIC
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" || die
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS} $(java-pkg_get-jni-cflags)" || die
 }
 
+#there seem to be unit tests, but they are in such a state.
+
 src_install() {
 	java-pkg_newjar lib/onion-${PN}.jar ${PN}.jar
 	use doc && java-pkg_dojavadoc javadoc
diff --git a/dev-java/fec/files/fec-1.0.4-soname.patch b/dev-java/fec/files/fec-1.0.4-soname.patch
new file mode 100644
index 000000000000..57fc90026ab4
--- /dev/null
+++ b/dev-java/fec/files/fec-1.0.4-soname.patch
@@ -0,0 +1,22 @@
+--- Makefile.bak	2010-02-27 00:51:38.000000000 +1300
++++ Makefile	2010-02-27 00:56:06.000000000 +1300
+@@ -21,7 +21,8 @@
+ 	$(CC) $(CFLAGS) -DGF_BITS=8 -o fec fec8.o test.c
+ 
+ libfec8.so: fec8.o fec8-jinterf.o
+-	$(CC) $(LDFLAGS) -shared fec8-jinterf.o fec8.o -o libfec8.so
++	$(CC) $(LDFLAGS) -shared fec8-jinterf.o fec8.o -o libfec8.so \
++		-Wl,-soname=libfec8.so
+ 
+ fec8-jinterf.o: fec-jinterf.c
+ 	$(CC) $(CFLAGS) -DGF_BITS=8 -c \
+@@ -35,7 +36,8 @@
+ 	$(CC) $(CFLAGS) -DGF_BITS=8 -S -o fec8.S fec.c
+ 
+ libfec16.so: fec16.o fec16-jinterf.o
+-	$(CC) $(LDFLAGS) -shared fec16-jinterf.o fec16.o -o libfec16.so
++	$(CC) $(LDFLAGS) -shared fec16-jinterf.o fec16.o -o libfec16.so \
++		-Wl,-soname=libfec16.so
+ 
+ fec16-jinterf.o: fec-jinterf.c
+ 	$(CC) $(CFLAGS) -DGF_BITS=16 -c \