mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove obsolete HSQLDB_USE_JDBC_4_1

Browse Source 
...that must always be true ever since 1b8c61d5ca
"Bump JDK buildtime requirement to 1.6"

Change-Id: I9432ac9d0a0e2c4999a80b6f144099d0e4dc15bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132616
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2022-04-06 08:20:14 +02:00
parent fd0aa82a61
commit cedf0b2354
3 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config_host.mk.in
View File

@@ -311,7 +311,6 @@ export HELP_ONLINE=@HELP_ONLINE@
export HELP_OMINDEX_PAGE=@HELP_OMINDEX_PAGE@ export HELP_OMINDEX_PAGE=@HELP_OMINDEX_PAGE@
export HOST_PLATFORM=@HOST_PLATFORM@ export HOST_PLATFORM=@HOST_PLATFORM@
export HSQLDB_JAR=@HSQLDB_JAR@ export HSQLDB_JAR=@HSQLDB_JAR@
export HSQLDB_USE_JDBC_4_1=@HSQLDB_USE_JDBC_4_1@
export HUNSPELL_CFLAGS=$(gb_SPACE)@HUNSPELL_CFLAGS@ export HUNSPELL_CFLAGS=$(gb_SPACE)@HUNSPELL_CFLAGS@
export HUNSPELL_LIBS=$(gb_SPACE)@HUNSPELL_LIBS@ export HUNSPELL_LIBS=$(gb_SPACE)@HUNSPELL_LIBS@
export HYPHEN_LIB=$(gb_SPACE)@HYPHEN_LIB@ export HYPHEN_LIB=$(gb_SPACE)@HYPHEN_LIB@

11
configure.ac
View File

@@ -5789,7 +5789,6 @@ if test "$cross_compiling" = "yes"; then
ANT ANT
ANT_HOME ANT_HOME
ANT_LIB ANT_LIB
HSQLDB_USE_JDBC_4_1
JAVA_CLASSPATH_NOT_SET JAVA_CLASSPATH_NOT_SET
JAVA_SOURCE_VER JAVA_SOURCE_VER
JAVA_TARGET_VER JAVA_TARGET_VER
@@ -10159,7 +10158,6 @@ dnl ===================================================================
dnl Check for system hsqldb dnl Check for system hsqldb
dnl =================================================================== dnl ===================================================================
if test "$with_java" != "no" -a "$cross_compiling" != "yes"; then if test "$with_java" != "no" -a "$cross_compiling" != "yes"; then
HSQLDB_USE_JDBC_4_1=
AC_MSG_CHECKING([which hsqldb to use]) AC_MSG_CHECKING([which hsqldb to use])
if test "$with_system_hsqldb" = "yes"; then if test "$with_system_hsqldb" = "yes"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
@@ -10211,14 +10209,6 @@ if test "$with_java" != "no" -a "$cross_compiling" != "yes"; then
SYSTEM_HSQLDB= SYSTEM_HSQLDB=
BUILD_TYPE="$BUILD_TYPE HSQLDB" BUILD_TYPE="$BUILD_TYPE HSQLDB"
NEED_ANT=TRUE NEED_ANT=TRUE
AC_MSG_CHECKING([whether hsqldb should be built with JDBC 4.1])
javanumver=`$JAVAINTERPRETER -version 2>&1 | $AWK -v num=true -f $SRC_ROOT/solenv/bin/getcompver.awk`
if expr "$javanumver" '>=' 000100060000 > /dev/null; then
AC_MSG_RESULT([yes])
HSQLDB_USE_JDBC_4_1=TRUE
else
AC_MSG_RESULT([no])
fi
fi fi
else else
if test "$with_java" != "no" -a -z "$HSQLDB_JAR"; then if test "$with_java" != "no" -a -z "$HSQLDB_JAR"; then
@@ -10227,7 +10217,6 @@ else
fi fi
AC_SUBST(SYSTEM_HSQLDB) AC_SUBST(SYSTEM_HSQLDB)
AC_SUBST(HSQLDB_JAR) AC_SUBST(HSQLDB_JAR)
AC_SUBST([HSQLDB_USE_JDBC_4_1])
dnl =================================================================== dnl ===================================================================
dnl Check for PostgreSQL stuff dnl Check for PostgreSQL stuff

6
external/hsqldb/UnpackedTarball_hsqldb.mk vendored
View File

@@ -25,10 +25,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\
external/hsqldb/patches/fdo36824.patch \ external/hsqldb/patches/fdo36824.patch \
external/hsqldb/patches/limit_as_table_alias.patch \ external/hsqldb/patches/limit_as_table_alias.patch \
external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch \ external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch \
$(if $(HSQLDB_USE_JDBC_4_1),\ external/hsqldb/patches/jdbc-4.1.patch \
external/hsqldb/patches/jdbc-4.1.patch \ external/hsqldb/patches/multipleResultSets.patch \
external/hsqldb/patches/multipleResultSets.patch \
) \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4: