summaryrefslogtreecommitdiff
path: root/external/hsqldb
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2022-04-06 08:20:14 +0200
committerStephan Bergmann <sbergman@redhat.com>2022-04-06 10:46:47 +0200
commitcedf0b23542a06cd31440dd1deb450d03191a1b9 (patch)
tree64ec4d29f37fcd630678c1bf79387c2f1d04c0c4 /external/hsqldb
parentfd0aa82a61612b90352b0780e62bb4d4dd0d94f8 (diff)
Remove obsolete HSQLDB_USE_JDBC_4_1
...that must always be true ever since 1b8c61d5ca8e2a7ae7a0bcd189b7a87defecea03 "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>
Diffstat (limited to 'external/hsqldb')
-rw-r--r--external/hsqldb/UnpackedTarball_hsqldb.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/external/hsqldb/UnpackedTarball_hsqldb.mk b/external/hsqldb/UnpackedTarball_hsqldb.mk
index cbba770f19a0..389572377fa6 100644
--- a/external/hsqldb/UnpackedTarball_hsqldb.mk
+++ b/external/hsqldb/UnpackedTarball_hsqldb.mk
@@ -25,10 +25,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\
external/hsqldb/patches/fdo36824.patch \
external/hsqldb/patches/limit_as_table_alias.patch \
external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch \
- $(if $(HSQLDB_USE_JDBC_4_1),\
- external/hsqldb/patches/jdbc-4.1.patch \
- external/hsqldb/patches/multipleResultSets.patch \
- ) \
+ external/hsqldb/patches/jdbc-4.1.patch \
+ external/hsqldb/patches/multipleResultSets.patch \
))
# vim: set noet sw=4 ts=4: