config_host.mk.in | 1 +
configure.in | 10 ++++++++++
hsqldb/UnpackedTarball_hsqldb.mk | 6 +++---
solenv/gbuild/UnpackedTarball.mk | 7 ++++++-
4 files changed, 20 insertions(+), 4 deletions(-)
New commits:
commit 3e9f9e5e4d301fd97a0da8f6625a652fba0ff471
Author: David Tardon <dtar...@redhat.com>
Date: Mon Aug 27 07:03:36 2012 +0200
include can be first statement now
Change-Id: I16edd2d6f0c7fbf2a7686e5adc43b1848902b957
diff --git a/hsqldb/UnpackedTarball_hsqldb.mk b/hsqldb/UnpackedTarball_hsqldb.mk
index 2139eae..186b491 100644
--- a/hsqldb/UnpackedTarball_hsqldb.mk
+++ b/hsqldb/UnpackedTarball_hsqldb.mk
@@ -7,10 +7,10 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,hsqldb))
-
include $(SRCDIR)/hsqldb/version.mk
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,hsqldb))
+
$(eval $(call
gb_UnpackedTarball_set_tarball,hsqldb,17410483b5b5f267aa18b7e00b65e6e0-hsqldb_$(HSQLDB_VERSION).zip))
$(eval $(call gb_UnpackedTarball_fix_end_of_line,hsqldb,\
commit 95793fb9c7813de4faa2e4ab82128eb90a896e43
Author: David Tardon <dtar...@redhat.com>
Date: Mon Aug 27 07:03:13 2012 +0200
make the makefile dep more robust
Change-Id: Iabf62eb089530dff97c0a920b2be9c239b02d5b8
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 0bd9128..44048a9 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -167,6 +167,11 @@ $(call gb_UnpackedTarball_get_clean_target,%) :
$(call gb_UnpackedTarball_get_dir,$*) \
)
+define gb_UnpackedTarball__get_makefile
+$(lastword $(foreach makefile,$(MAKEFILE_LIST),$(if $(filter
UnpackedTarball_%,$(notdir $(makefile))),$(makefile))))
+
+endef
+
# Initialize unpacked tarball
define gb_UnpackedTarball_UnpackedTarball_internal
$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_CXX_SUFFIX :=
@@ -177,7 +182,7 @@ $(call gb_UnpackedTarball_get_target,$(1)) :
UNPACKED_PATCHES :=
$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHLEVEL :=
$(gb_UnpackedTarball_PATCHLEVEL_DEFAULT)
$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_POST_ACTION :=
-$(call gb_UnpackedTarball_get_preparation_target,$(1)) : $(lastword
$(MAKEFILE_LIST))
+$(call gb_UnpackedTarball_get_preparation_target,$(1)) : $(call
gb_UnpackedTarball__get_makefile)
$(call gb_UnpackedTarball_get_preparation_target,$(1)) :| $(dir $(call
gb_UnpackedTarball_get_target,$(1))).dir
$(call gb_UnpackedTarball_get_target,$(1)) : $(call
gb_UnpackedTarball_get_preparation_target,$(1))
$(call gb_UnpackedTarball_get_target,$(1)) :| $(dir $(call
gb_UnpackedTarball_get_target,$(1))).dir
commit 647080954f4985e3e16ad863efbe89e459b26f8e
Author: David Tardon <dtar...@redhat.com>
Date: Sun Aug 26 20:39:18 2012 +0200
fix conditional inclusion of jdbc patch in hsqldb
Change-Id: I75e4566509d1851e7405d1738ffeaf58261233ea
diff --git a/config_host.mk.in b/config_host.mk.in
index c6ffc88..359915a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -227,6 +227,7 @@ export HAVE_READDIR_R=@HAVE_READDIR_R@
export HAVE_THREADSAFE_STATICS=@HAVE_THREADSAFE_STATICS@
export HOST_PLATFORM=@host@
export HSQLDB_JAR=@HSQLDB_JAR@
+export HSQLDB_USE_JDBC_4_1=@HSQLDB_USE_JDBC_4_1@
export HUNART_EXTENSION_PACK=@HUNART_EXTENSION_PACK@
export HUNSPELL_CFLAGS=@HUNSPELL_CFLAGS@
export HUNSPELL_LIBS=@HUNSPELL_LIBS@
diff --git a/configure.in b/configure.in
index 7d7ec8b..1a23dff 100644
--- a/configure.in
+++ b/configure.in
@@ -7250,6 +7250,7 @@ dnl
===================================================================
dnl Check for system hsqldb
dnl ===================================================================
if test "$with_java" != "no"; then
+HSQLDB_USE_JDBC_4_1=
AC_MSG_CHECKING([which hsqldb to use])
if test "$with_system_hsqldb" = "yes"; then
AC_MSG_RESULT([external])
@@ -7290,9 +7291,18 @@ else
AC_MSG_RESULT([internal])
SYSTEM_HSQLDB=NO
BUILD_TYPE="$BUILD_TYPE HSQLDB"
+ 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=YES
+ else
+ AC_MSG_RESULT([no])
+ fi
fi
AC_SUBST(SYSTEM_HSQLDB)
AC_SUBST(HSQLDB_JAR)
+AC_SUBST([HSQLDB_USE_JDBC_4_1])
fi
dnl ===================================================================
diff --git a/hsqldb/UnpackedTarball_hsqldb.mk b/hsqldb/UnpackedTarball_hsqldb.mk
index 9c9b87a..2139eae 100644
--- a/hsqldb/UnpackedTarball_hsqldb.mk
+++ b/hsqldb/UnpackedTarball_hsqldb.mk
@@ -25,7 +25,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\
hsqldb/patches/i103528.patch \
hsqldb/patches/i104901.patch \
hsqldb/patches/fdo36824.patch \
- $(if $(filter-out 1.5,$(JAVA_SOURCE_VER)),\
+ $(if $(filter YES,$(HSQLDB_USE_JDBC_4_1)),\
hsqldb/patches/jdbc-4.1.patch \
) \
))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
