Gentoo Archives: gentoo-commits

From: "Diego Petteno (flameeyes)" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/jffi: ChangeLog jffi-0.7_pre20100131.ebuild
Date: Sun, 31 Jan 2010 16:32:27
Message-Id: E1NbciV-0007Ws-OU@stork.gentoo.org
1 flameeyes 10/01/31 16:32:07
2
3 Modified: ChangeLog
4 Added: jffi-0.7_pre20100131.ebuild
5 Log:
6 Add a snapshot from upstream, this time the path to the library is injected at build-time so that it does not have to be defined at runtime.
7 (Portage version: 2.2_rc62/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.10 dev-java/jffi/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jffi/ChangeLog?rev=1.10&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jffi/ChangeLog?rev=1.10&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jffi/ChangeLog?r1=1.9&r2=1.10
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v
19 retrieving revision 1.9
20 retrieving revision 1.10
21 diff -u -r1.9 -r1.10
22 --- ChangeLog 24 Jan 2010 20:56:13 -0000 1.9
23 +++ ChangeLog 31 Jan 2010 16:32:07 -0000 1.10
24 @@ -1,6 +1,13 @@
25 # ChangeLog for dev-java/jffi
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.9 2010/01/24 20:56:13 betelgeuse Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.10 2010/01/31 16:32:07 flameeyes Exp $
29 +
30 +*jffi-0.7_pre20100131 (31 Jan 2010)
31 +
32 + 31 Jan 2010; Diego E. Pettenò <flameeyes@g.o>
33 + +jffi-0.7_pre20100131.ebuild, +files/jffi-0.7-makefile-flags.patch:
34 + Add a snapshot from upstream, this time the path to the library is
35 + injected at build-time so that it does not have to be defined at runtime.
36
37 24 Jan 2010; Petteri Räty <betelgeuse@g.o> jffi-0.6.0.2-r1.ebuild:
38 Filter ecj.
39
40
41
42 1.1 dev-java/jffi/jffi-0.7_pre20100131.ebuild
43
44 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jffi/jffi-0.7_pre20100131.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jffi/jffi-0.7_pre20100131.ebuild?rev=1.1&content-type=text/plain
46
47 Index: jffi-0.7_pre20100131.ebuild
48 ===================================================================
49 # Copyright 1999-2010 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-0.7_pre20100131.ebuild,v 1.1 2010/01/31 16:32:07 flameeyes Exp $
52
53 # Probably best to leave the CFLAGS as they are here. See...
54 # http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
55
56 EAPI="2"
57 JAVA_PKG_IUSE="source test"
58 WANT_ANT_TASKS="ant-nodeps"
59 inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic versionator
60
61 DESCRIPTION="An optimized Java interface to libffi"
62 HOMEPAGE="http://kenai.com/projects/jffi"
63
64 TREE_HASH="6c5fb4a241a747f7c8561156ed81fbee52a0174f"
65 SRC_URI="http://github.com/wmeissner/jffi/tarball/${TREE_HASH} -> ${PN}-git-${PV}.tgz"
66 S="${WORKDIR}/wmeissner-${PN}-${TREE_HASH:0:7}"
67
68 LICENSE="LGPL-3"
69 SLOT="0.4"
70 KEYWORDS="~amd64 ~ppc ~x86"
71 IUSE=""
72
73 RDEPEND=">=virtual/jre-1.5
74 virtual/libffi"
75
76 DEPEND=">=virtual/jdk-1.5
77 virtual/libffi
78 dev-util/pkgconfig
79 test? ( dev-java/ant-junit4 )"
80
81 JAVA_PKG_BSFIX_NAME="build-impl.xml"
82 JAVA_PKG_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5"
83
84 java_prepare() {
85 # Delete the bundled JARs.
86 find lib -name "*.jar" -delete || die
87 # Delete the bundled libffi
88 rm -rf jni/libffi || die
89
90 # bug #271533 and #272058
91 epatch "${FILESDIR}/${PN}-0.7-makefile-flags.patch"
92
93 # bug #272058
94 append-cflags $(pkg-config --cflags-only-I libffi)
95
96 # any better function for this, excluding get_system_arch in java-vm-2 which is incorrect to inherit ?
97 local arch=""
98 use x86 && arch="i386"
99 use amd64 && arch="x86_64"
100 use ppc && arch="ppc"
101
102 # Fetch our own prebuilt libffi.
103 mkdir -p "build/jni/libffi-${arch}-linux/.libs" || die
104
105 ln -snf "/usr/$(get_libdir)/libffi.so" \
106 "build/jni/libffi-${arch}-linux/.libs/libffi_convenience.a" || die
107
108 # Don't include prebuilt files for other archs.
109 sed -i '/<zipfileset src="archive\//d' custom-build.xml || die
110 sed -i '/libs.CopyLibs.classpath/d' lib/nblibraries.properties || die
111 sed -i '/copylibstask.jar/d' lib/nblibraries.properties || die
112 }
113
114 src_install() {
115 mkdir -p "${T}"/com/kenai/jffi
116 cat - > "${T}"/com/kenai/jffi/boot.properties <<EOF
117 jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
118 EOF
119
120 pushd "${T}" &>/dev/null
121 jar -uf "${S}"/dist/${PN}.jar com
122 popd
123
124 java-pkg_dojar dist/${PN}.jar
125 java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2).so
126 use source && java-pkg_dosrc src/*
127 }
128
129 src_test() {
130 ANT_TASKS="ant-junit4 ant-nodeps" eant test \
131 -Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)"
132 }