diff options
| author | William Deegan <bill@baddogconsulting.com> | 2018-11-05 23:24:03 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2018-11-05 23:24:03 (GMT) |
| commit | ab8c830e78c5f596b77d52beb318de713d0d9bf2 (patch) | |
| tree | 5fc33bbde60da6d79c984b3cd12d4774afee5934 | |
| parent | 75cb659bf55b83b49fb4852ad3f120f95834a9be (diff) | |
| download | SCons-ab8c830e78c5f596b77d52beb318de713d0d9bf2.zip SCons-ab8c830e78c5f596b77d52beb318de713d0d9bf2.tar.gz SCons-ab8c830e78c5f596b77d52beb318de713d0d9bf2.tar.bz2 | |
Fix java install location for centos 7 to resolve failing Java/multi-step.py test
| -rw-r--r-- | src/CHANGES.txt | 1 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/JavaCommon.py | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index b413ac3..bcb9aa4 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -51,6 +51,7 @@ RELEASE 3.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE - Fix Java tools to search reasonable default paths for Win32, Linux, macOS. Add required paths for swig and java native interface to JAVAINCLUDES. You should add these to your CPPPATH if you need to compile with them. This handles spaces in paths in default Java paths on windows. + - Added more java paths to match install for Centos 7 of openjdk From Andrew Featherstone - Removed unused --warn options from the man page and source code. diff --git a/src/engine/SCons/Tool/JavaCommon.py b/src/engine/SCons/Tool/JavaCommon.py index 3a472a9..c6c4d7a 100644 --- a/src/engine/SCons/Tool/JavaCommon.py +++ b/src/engine/SCons/Tool/JavaCommon.py @@ -401,7 +401,9 @@ java_macos_include_dir = '/System/Library/Frameworks/JavaVM.framework/Headers/' 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-*-oracle/include'] + '/usr/lib/jvm/java-*/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', '/usr/lib/jvm/java-%s*-openjdk*/include', '/usr/java/jdk%s*/include'] |