external/libmariadb/UnpackedTarball_mariadb.mk | 1
external/libmariadb/mariadb-inline.patch.1 | 23 +++++++++
external/mysqlcppconn/Library_mysqlcppconn.mk | 15 ++----
external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk | 2
external/mysqlcppconn/version_info.h | 42 ++++++++++++++++++
5 files changed, 73 insertions(+), 10 deletions(-)
New commits:
commit eef839fe482c8c3ba2152b3e1edd43fb21c2de02
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Thu Sep 4 08:24:40 2014 +0200
fdo#82847 mariadb patch out problematic 'inline' that result in link issue
Change-Id: I60d9ba1315090c896d6f7f9b3d407ab11a1d2037
diff --git a/external/libmariadb/UnpackedTarball_mariadb.mk
b/external/libmariadb/UnpackedTarball_mariadb.mk
index c3c5ed4..d3a315f 100644
--- a/external/libmariadb/UnpackedTarball_mariadb.mk
+++ b/external/libmariadb/UnpackedTarball_mariadb.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb,1))
$(eval $(call gb_UnpackedTarball_add_patches,mariadb,\
external/libmariadb/mariadb-swap.patch \
external/libmariadb/mariadb-msvc.patch.1 \
+ external/libmariadb/mariadb-inline.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libmariadb/mariadb-inline.patch.1
b/external/libmariadb/mariadb-inline.patch.1
new file mode 100644
index 0000000..84ebc81
--- /dev/null
+++ b/external/libmariadb/mariadb-inline.patch.1
@@ -0,0 +1,23 @@
+diff -ur mariadb.org/libmariadb/hash.c mariadb/libmariadb/hash.c
+--- mariadb.org/libmariadb/hash.c 2014-09-03 14:57:29.000000000 +0200
++++ mariadb/libmariadb/hash.c 2014-09-03 14:59:09.000000000 +0200
+@@ -94,7 +94,7 @@
+ handle inline functions that are not defined as native types
+ */
+
+-inline char*
++uchar*
+ hash_key(HASH *hash,const uchar *record,uint *length,my_bool first)
+ {
+ if (hash->get_key)
+@@ -191,9 +191,6 @@
+ #endif
+
+
+-#ifndef __SUNPRO_C /* SUNPRO can't handle this */
+-inline
+-#endif
+ unsigned int rec_hashnr(HASH *hash,const uchar *record)
+ {
+ uint length;
+
commit e68a4a40ee3d321307029388107537ecee288e18
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Wed Sep 3 15:25:29 2014 +0200
non-system mariadb need iconv
Change-Id: I2c150d9adf9f5d21b36c9cf57f62e214dc97b680
diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk
b/external/mysqlcppconn/Library_mysqlcppconn.mk
index 2abfcb3..2d9b353 100644
--- a/external/mysqlcppconn/Library_mysqlcppconn.mk
+++ b/external/mysqlcppconn/Library_mysqlcppconn.mk
@@ -24,6 +24,12 @@ $(eval $(call gb_Library_add_libs,mysqlcppconn,\
endif
+ifeq ($(SYSTEM_MARIADB),)
+$(eval $(call gb_Library_use_externals,mysqlcppconn,\
+ iconv \
+))
+endif
+
$(eval $(call gb_Library_set_warnings_not_errors,mysqlcppconn))
$(eval $(call gb_Library_set_generated_cxx_suffix,mysqlcppconn,cpp))
commit 4c232e49621065d6b12e087333f44a224f788d71
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Wed Sep 3 15:25:01 2014 +0200
remove build dependency on cmake for sqlconnector
Change-Id: I73a56b902099939972b8f5c8a55d231459e5421b
diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk
b/external/mysqlcppconn/Library_mysqlcppconn.mk
index 1670de8..2abfcb3 100644
--- a/external/mysqlcppconn/Library_mysqlcppconn.mk
+++ b/external/mysqlcppconn/Library_mysqlcppconn.mk
@@ -74,13 +74,4 @@ $(eval $(call
gb_Library_add_generated_exception_objects,mysqlcppconn,\
UnpackedTarball/mysqlcppconn/driver/nativeapi/mysql_native_statement_wrapper \
))
-$(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn/driver/mysql_metadata.o
$(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn/driver/mysql_driver.o:
$(WORKDIR)/UnpackedTarball/mysqlcppconn/driver/version_info.h
-
-ifeq ($(SYSTEM_BOOST),)
-MYSQLCPPCONN_BOOST:=-DBOOST_ROOT:STRING=$(call
gb_UnpackedTarball_get_dir,boost)
-endif
-
-$(WORKDIR)/UnpackedTarball/mysqlcppconn/driver/version_info.h: $(call
gb_UnpackedTarball_get_target,mysqlcppconn)
$(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn/driver/mysql_util.o
- cd $(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn && cmake
$(MYSQLCPPCONN_BOOST) ../../../UnpackedTarball/mysqlcppconn/
-
# vim: set noet sw=4 ts=4:
diff --git a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
index 5f5a437..9647c38 100644
--- a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
+++ b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
@@ -12,13 +12,13 @@ $(eval $(call
gb_UnpackedTarball_UnpackedTarball,mysqlcppconn))
$(eval $(call
gb_UnpackedTarball_set_tarball,mysqlcppconn,$(MYSQLCPPCONN_TARBALL)))
$(eval $(call
gb_UnpackedTarball_add_file,mysqlcppconn,cppconn/config.h,external/mysqlcppconn/config.h))
+$(eval $(call
gb_UnpackedTarball_add_file,mysqlcppconn,version_info.h,external/mysqlcppconn/version_info.h))
$(eval $(call
gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_config.h,external/mysqlcppconn/binding_config.h))
$(eval $(call gb_UnpackedTarball_add_patches,mysqlcppconn,\
external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \
external/mysqlcppconn/patches/warnings.patch.0 \
- external/mysqlcppconn/patches/cmake.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/mysqlcppconn/version_info.h
b/external/mysqlcppconn/version_info.h
new file mode 100644
index 0000000..a0203da
--- /dev/null
+++ b/external/mysqlcppconn/version_info.h
@@ -0,0 +1,42 @@
+/*
+Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+
+The MySQL Connector/C++ is licensed under the terms of the GPLv2
+<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
+MySQL Connectors. There are special exceptions to the terms and
+conditions of the GPLv2 as it is applied to this software, see the
+FLOSS License Exception
+<http://www.mysql.com/about/legal/licensing/foss-exception.html>.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published
+by the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+/* Please do not edit this file - it is generated by cmake. Edit its source
file instead. */
+
+#define MYCPPCONN_MAJOR_VERSION 1
+#define MYCPPCONN_MINOR_VERSION 1
+#define MYCPPCONN_PATCH_VERSION 4
+
+#define SETUP_VERSION "1.01.0004"
+#define DRIVER_VERSION "0" SETUP_VERSION
+
+#define MYCPPCONN_VERSION SETUP_VERSION
+#define MYCPPCONN_FILEVER 1,1,4,0
+#define MYCPPCONN_PRODUCTVER MYCPPCONN_FILEVER
+#define MYCPPCONN_STRFILEVER "1, 1, 4, 0\0"
+#define MYCPPCONN_STRPRODUCTVER MYCPPCONN_STRFILEVER
+
+#define MYCPPCONN_STRSERIES "1.1"
+#define MYCPPCONN_STRQUALITY "GA"
+#define MYCPPCONN_STRVERSION "1.1.4"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
