summaryrefslogtreecommitdiff
path: root/dev-util/scons/files/scons-3.0.5-jni.h-include-path.patch
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/scons/files/scons-3.0.5-jni.h-include-path.patch')
-rw-r--r--dev-util/scons/files/scons-3.0.5-jni.h-include-path.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/dev-util/scons/files/scons-3.0.5-jni.h-include-path.patch b/dev-util/scons/files/scons-3.0.5-jni.h-include-path.patch
new file mode 100644
index 000000000000..818db02279af
--- /dev/null
+++ b/dev-util/scons/files/scons-3.0.5-jni.h-include-path.patch
@@ -0,0 +1,14 @@
+diff -Nur old/testing/framework/TestSCons.py new/testing/framework/TestSCons.py
+--- old/testing/framework/TestSCons.py 2019-03-27 02:15:48.000000000 +0300
++++ new/testing/framework/TestSCons.py 2019-06-07 16:13:48.000000000 +0300
+@@ -742,7 +742,8 @@
+ version=''
+ jni_dirs = ['/System/Library/Frameworks/JavaVM.framework/Headers/jni.h',
+- '/usr/lib/jvm/default-java/include/jni.h',
+- '/usr/lib/jvm/java-*-oracle/include/jni.h']
++ '/usr/lib/jvm/*/include/jni.h',
++ '/opt/*jdk-bin-*/include/jni.h',
++ '/usr/lib*/openjdk-*/include/jni.h']
+ else:
+ jni_dirs = ['/System/Library/Frameworks/JavaVM.framework/Versions/%s*/Headers/jni.h'%version]
+ jni_dirs.extend(['/usr/lib/jvm/java-*-sun-%s*/include/jni.h'%version,