diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2023-08-18 09:30:17 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2023-08-18 20:14:30 +0200 |
| commit | 94c94633a4e6f1622c7cc31ce6efd41862691d59 (patch) | |
| tree | 3d11deff04fcaac6208d57af584e2504dd47c5ea /config_host.mk.in | |
| parent | 0008ff3597e9d89481d5fccb5cefa7f058400a43 (diff) | |
Drop JAVA_CLASSPATH_NOT_SET which is always TRUE
The variable was introduced in
commit b97cade9183d14ad21ae71892348a9a81689488b
Date: Sun Apr 7 12:14:36 2013 -0400
Supress warnings about unset classpath
I get the below warning for every single jar file without this patch.
warning: [options] bootstrap class path not set in conjunction with
-source 1.5
1 warning
Change-Id: I71c01aeea993640f1ec86fe1d8a977656861358d
, at a time when Java 5 was the minimum version,
likely to suppress warnings with JDK versions >= 6
(greater than 1.6.0 to be exact...).
The version check was then just bumped along with the Java
baseline bumps in
commit aafc10c9edb61e13ac557c7e43c8d4a31dce4f37
Date: Fri Jul 26 10:19:39 2019 +0200
Bump Java baseline to Java 8
and
commit 941b567a41569260fef14a7337511e8f42337323
Date: Thu May 7 09:42:22 2020 +0200
tdf#131572 Add java 9 module info for libreoffice.jar
for no apparent reason.
In any case, the variable will always be set to TRUE,
since the Java version string is using the actual
major version number as the first digit since
JDK 9 (while JDK 8 would still use 1.8.x as version
string), s.a. upcoming commit
Change-Id I79eeb247315499caddd63d6abbb1e14ea6a72a4a
("configure.ac: Update Java check for JDK >= 9 version string").
Drop the variable and set the Java params
in `solenv/gbuild/JavaClassSet.mk` unconditionally.
Change-Id: Ib4aad07da3937289fc6ff29dd80abdd4c35f1773
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155825
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 8b345a690eff..f4e6841b22d6 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -353,7 +353,6 @@ export JAVADOCISGJDOC=@JAVADOCISGJDOC@ export JAVACFLAGS=@JAVACFLAGS@ export JAVAIFLAGS=@JAVAIFLAGS@ export JAVAIFLAGS_FOR_BUILD=@JAVAIFLAGS_FOR_BUILD@ -export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@ export JAVAINTERPRETER=@JAVAINTERPRETER@ export JAVA_HOME=@JAVA_HOME@ export JAVA_HOME_FOR_BUILD=@JAVA_HOME_FOR_BUILD@ |