diff options
Diffstat (limited to 'dev-util/scons/files')
| -rw-r--r-- | dev-util/scons/files/scons-3.0.5-jdk-include-path.patch | 14 | ||||
| -rw-r--r-- | dev-util/scons/files/scons-3.0.5-jni.h-include-path.patch | 14 |
2 files changed, 0 insertions, 28 deletions
diff --git a/dev-util/scons/files/scons-3.0.5-jdk-include-path.patch b/dev-util/scons/files/scons-3.0.5-jdk-include-path.patch deleted file mode 100644 index 708447592fa8..000000000000 --- a/dev-util/scons/files/scons-3.0.5-jdk-include-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur old/scons-3.0.5/src/engine/SCons/Tool/JavaCommon.py new/scons-3.0.5/src/engine/SCons/Tool/JavaCommon.py ---- old/src/engine/SCons/Tool/JavaCommon.py 2019-03-27 02:16:32.000000000 +0300 -+++ new/src/engine/SCons/Tool/JavaCommon.py 2019-06-04 10:44:01.000000000 +0300 -@@ -403,7 +403,8 @@ - java_macos_version_include_dir = '/System/Library/Frameworks/JavaVM.framework/Versions/%s*/Headers/' - --java_linux_include_dirs = ['/usr/lib/jvm/default-java/include', -- '/usr/lib/jvm/java-*/include'] -+java_linux_include_dirs = ['/usr/lib/jvm/*/include', -+ '/opt/*jdk-bin-*/include', -+ '/usr/lib*/openjdk-*/include'] - # Need to match path like below (from Centos 7) - # /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.191.b12-0.el7_5.x86_64/include/ - java_linux_version_include_dirs = ['/usr/lib/jvm/java-*-sun-%s*/include', 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 deleted file mode 100644 index 818db02279af..000000000000 --- a/dev-util/scons/files/scons-3.0.5-jni.h-include-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -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, |