Gentoo Archives: gentoo-commits

From: "Vlastimil Babka (caster)" <caster@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/tijmp/files: tijmp-jni.h.patch
Date: Mon, 05 Apr 2010 12:09:13
Message-Id: 20100405120909.22A152C04A@corvid.gentoo.org
1 caster 10/04/05 12:09:08
2
3 Added: tijmp-jni.h.patch
4 Log:
5 New package based on dev-java/jmp but for the new JDK 1.6 API. Bug #233548.
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 dev-java/tijmp/files/tijmp-jni.h.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/tijmp/files/tijmp-jni.h.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/tijmp/files/tijmp-jni.h.patch?rev=1.1&content-type=text/plain
13
14 Index: tijmp-jni.h.patch
15 ===================================================================
16 # Patch by Vlastimil Babka <caster@g.o>
17 # Some JDK's such as ibm-jdk-bin don't have jni_md.h, so make the test more robust
18 --- configure.ac.orig 2009-01-10 00:29:01.000000000 +0100
19 +++ configure.ac 2010-04-05 12:17:35.000000000 +0200
20 @@ -24,22 +24,16 @@
21 JAVA_HOME=/usr/local/jdk
22 fi
23
24 -jni_md=no
25 -AC_CHECK_HEADERS($JAVA_HOME/include/$java_os/jni_md.h,
26 - jni_md=found)
27 +dnl ok, maybe we dont always need include/$java_os but we use an -I for it anyway...
28 +CPPFLAGS="$CPPFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/$java_os"
29
30 -if test $jni_md = no
31 -then
32 -AC_CHECK_HEADERS($JAVA_HOME/include/jni_md.h,
33 - jni_md=found)
34 -fi
35 +jni_h=no
36 +AC_CHECK_HEADERS($JAVA_HOME/include/jni.h,
37 + jni_h=found)
38
39 -if test $jni_md = no
40 +if test $jni_h = no
41 then
42 - AC_MSG_ERROR(Does JAVA_HOME point to the java SDK directory?)
43 -else
44 -dnl ok, maybe we dont need include/$java_os but we use an -I for it anyway...
45 - CPPFLAGS="$CPPFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/$java_os"
46 + AC_MSG_ERROR(Could not find jni.h. Does JAVA_HOME point to the java SDK directory?)
47 fi
48
49 AC_CHECK_HEADER($JAVA_HOME/include/jvmti.h,