1 |
ali_bush 10/02/26 12:24:29 |
2 |
|
3 |
Modified: ChangeLog fec-1.0.4.ebuild |
4 |
Log: |
5 |
Fix build error. see #300401. |
6 |
(Portage version: 2.1.7.17/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.9 dev-java/fec/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/fec/ChangeLog?rev=1.9&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/fec/ChangeLog?rev=1.9&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/fec/ChangeLog?r1=1.8&r2=1.9 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/fec/ChangeLog,v |
18 |
retrieving revision 1.8 |
19 |
retrieving revision 1.9 |
20 |
diff -u -r1.8 -r1.9 |
21 |
--- ChangeLog 17 Jan 2010 17:56:26 -0000 1.8 |
22 |
+++ ChangeLog 26 Feb 2010 12:24:29 -0000 1.9 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for dev-java/fec |
25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fec/ChangeLog,v 1.8 2010/01/17 17:56:26 tommy Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fec/ChangeLog,v 1.9 2010/02/26 12:24:29 ali_bush Exp $ |
28 |
+ |
29 |
+ 26 Feb 2010; Alistair Bush <ali_bush@g.o> fec-1.0.4.ebuild, |
30 |
+ +files/fec-1.0.4-soname.patch: |
31 |
+ Fix build error. see #300401. |
32 |
|
33 |
17 Jan 2010; Thomas Sachau (Tommy[D]) <tommy@g.o> fec-1.0.4.ebuild: |
34 |
Add -fPIC for amd64 ARCH too, bug 301296 |
35 |
|
36 |
|
37 |
|
38 |
1.3 dev-java/fec/fec-1.0.4.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/fec/fec-1.0.4.ebuild?rev=1.3&view=markup |
41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/fec/fec-1.0.4.ebuild?rev=1.3&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/fec/fec-1.0.4.ebuild?r1=1.2&r2=1.3 |
43 |
|
44 |
Index: fec-1.0.4.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/fec/fec-1.0.4.ebuild,v |
47 |
retrieving revision 1.2 |
48 |
retrieving revision 1.3 |
49 |
diff -u -r1.2 -r1.3 |
50 |
--- fec-1.0.4.ebuild 17 Jan 2010 17:56:26 -0000 1.2 |
51 |
+++ fec-1.0.4.ebuild 26 Feb 2010 12:24:29 -0000 1.3 |
52 |
@@ -1,6 +1,6 @@ |
53 |
# Copyright 1999-2010 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fec/fec-1.0.4.ebuild,v 1.2 2010/01/17 17:56:26 tommy Exp $ |
56 |
+# $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 $ |
57 |
|
58 |
JAVA_PKG_IUSE="doc source" |
59 |
|
60 |
@@ -29,7 +29,12 @@ |
61 |
unpack ${A} |
62 |
cd "${S}" || die |
63 |
sed -i -e 's/build.compiler=jikes/#build.compiler=jikes/g' build.properties || die |
64 |
+ sed -i -e 's/test.lib/lib/g' build.properties || die |
65 |
epatch "${FILESDIR}"/${P}-libfec8path.patch |
66 |
+ pushd src/csrc > /dev/null |
67 |
+ epatch "${FILESDIR}/${P}-soname.patch" |
68 |
+ popd > /dev/null |
69 |
+ |
70 |
eant clean |
71 |
cd lib || die |
72 |
rm -v *.jar || die |
73 |
@@ -46,9 +51,11 @@ |
74 |
java-pkg-2_src_compile |
75 |
cd "${S}"/src/csrc |
76 |
(use amd64 || use hardened ) && append-flags -fPIC |
77 |
- emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" || die |
78 |
+ emake CC=$(tc-getCC) CFLAGS="${CFLAGS} $(java-pkg_get-jni-cflags)" || die |
79 |
} |
80 |
|
81 |
+#there seem to be unit tests, but they are in such a state. |
82 |
+ |
83 |
src_install() { |
84 |
java-pkg_newjar lib/onion-${PN}.jar ${PN}.jar |
85 |
use doc && java-pkg_dojavadoc javadoc |