diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
| commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
| tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /dev-java/tijmp/files | |
reinit the tree, so we can have metadata
Diffstat (limited to 'dev-java/tijmp/files')
| -rw-r--r-- | dev-java/tijmp/files/tijmp-0.8-respect-javacflags.patch | 11 | ||||
| -rw-r--r-- | dev-java/tijmp/files/tijmp-jni.h.patch | 34 |
2 files changed, 45 insertions, 0 deletions
diff --git a/dev-java/tijmp/files/tijmp-0.8-respect-javacflags.patch b/dev-java/tijmp/files/tijmp-0.8-respect-javacflags.patch new file mode 100644 index 000000000000..96902aedf4ec --- /dev/null +++ b/dev-java/tijmp/files/tijmp-0.8-respect-javacflags.patch @@ -0,0 +1,11 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -18,7 +18,7 @@ + java_files := $(foreach dir,$(dirs),$(find_files)) + class_files := $(patsubst $(jdir)/%.java,%.class,$(java_files)) + +-JCFLAGS := -source 1.6 -encoding ISO-8859-1 -Xlint:unchecked -deprecation ++JCFLAGS := $(JAVACFLAGS) -encoding ISO-8859-1 -Xlint:unchecked -deprecation + + # standard java compilation.. + JAVACOMPILE := $(JAVAC) $(JCFLAGS) -sourcepath $(jdir) -d $(top_builddir) diff --git a/dev-java/tijmp/files/tijmp-jni.h.patch b/dev-java/tijmp/files/tijmp-jni.h.patch new file mode 100644 index 000000000000..e9f18cc4ee68 --- /dev/null +++ b/dev-java/tijmp/files/tijmp-jni.h.patch @@ -0,0 +1,34 @@ +# Patch by Vlastimil Babka <caster@gentoo.org> +# Some JDK's such as ibm-jdk-bin don't have jni_md.h, so make the test more robust +--- configure.ac.orig 2009-01-10 00:29:01.000000000 +0100 ++++ configure.ac 2010-04-05 12:17:35.000000000 +0200 +@@ -24,22 +24,16 @@ + JAVA_HOME=/usr/local/jdk + fi + +-jni_md=no +-AC_CHECK_HEADERS($JAVA_HOME/include/$java_os/jni_md.h, +- jni_md=found) ++dnl ok, maybe we dont always need include/$java_os but we use an -I for it anyway... ++CPPFLAGS="$CPPFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/$java_os" + +-if test $jni_md = no +-then +-AC_CHECK_HEADERS($JAVA_HOME/include/jni_md.h, +- jni_md=found) +-fi ++jni_h=no ++AC_CHECK_HEADERS($JAVA_HOME/include/jni.h, ++ jni_h=found) + +-if test $jni_md = no ++if test $jni_h = no + then +- AC_MSG_ERROR(Does JAVA_HOME point to the java SDK directory?) +-else +-dnl ok, maybe we dont need include/$java_os but we use an -I for it anyway... +- CPPFLAGS="$CPPFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/$java_os" ++ AC_MSG_ERROR(Could not find jni.h. Does JAVA_HOME point to the java SDK directory?) + fi + + AC_CHECK_HEADER($JAVA_HOME/include/jvmti.h, |