[Libreoffice-commits] .: mysqlcppconn/makefile.mk mysqlcppconn/mysql-connector-cpp-mysql-binding-dynamic.patch mysqlcppconn/mysql-connector-cpp-mysql-binding-static.patch mysqlcppconn/mysql-connector-cpp.patch

[Petr Mladek]

 mysqlcppconn/makefile.mk                                     |   11 +++++++++++
 mysqlcppconn/mysql-connector-cpp-mysql-binding-dynamic.patch |    6 ++++++
 mysqlcppconn/mysql-connector-cpp-mysql-binding-static.patch  |    6 ++++++
 mysqlcppconn/mysql-connector-cpp.patch                       |    6 ------
 4 files changed, 23 insertions(+), 6 deletions(-)

New commits:
commit 89fe057d37b923d7d422e00159ea80c46d63bb82
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 17:07:51 2011 +0200

    do not require mysql-devel package at runtime when using system mysql
    
    useful for distro-specific builds

diff --git a/mysqlcppconn/makefile.mk b/mysqlcppconn/makefile.mk
index 60699c1..e047ea0 100644
--- a/mysqlcppconn/makefile.mk
+++ b/mysqlcppconn/makefile.mk
@@ -49,8 +49,19 @@ ADDITIONAL_FILES=\
 CONVERTFILES=\
                 cppconn$/build_config.h
 
+# distro-specific builds want to link against a particular mysql library
+# then they do not require mysql-devel package at runtime
+# So put mysql-connector-cpp/driver/nativeapi/binding_config.h into separate patch
+# and enable/disable MYSQLCLIENT_STATIC_BINDING according to the used mysql library
+.IF "$(SYSTEM_MYSQL)" == "YES"
+MYSQL_BINDING=static
+.ELSE
+MYSQL_BINDING=dynamic
+.ENDIF
+
 PATCH_FILES=\
     $(TARFILE_NAME).patch \
+    mysql-connector-cpp-mysql-binding-$(MYSQL_BINDING).patch \
     patches/default_to_protocol_tcp.patch
 
 BUILD_DIR=driver
diff --git a/mysqlcppconn/mysql-connector-cpp-mysql-binding-dynamic.patch b/mysqlcppconn/mysql-connector-cpp-mysql-binding-dynamic.patch
new file mode 100644
index 0000000..7007c3d
--- /dev/null
+++ b/mysqlcppconn/mysql-connector-cpp-mysql-binding-dynamic.patch
@@ -0,0 +1,6 @@
+--- misc/mysql-connector-cpp/driver/nativeapi/binding_config.h	2009-08-14 10:17:23.640625000 +0200
++++ misc/build/mysql-connector-cpp/driver/nativeapi/binding_config.h	2009-08-14 10:13:50.359375000 +0200
+@@ -1 +1,2 @@
+-dummy
++#define HAVE_DLFCN_H 1
++//#define MYSQLCLIENT_STATIC_BINDING 1
diff --git a/mysqlcppconn/mysql-connector-cpp-mysql-binding-static.patch b/mysqlcppconn/mysql-connector-cpp-mysql-binding-static.patch
new file mode 100644
index 0000000..b7edeb9
--- /dev/null
+++ b/mysqlcppconn/mysql-connector-cpp-mysql-binding-static.patch
@@ -0,0 +1,6 @@
+--- misc/mysql-connector-cpp/driver/nativeapi/binding_config.h	2009-08-14 10:17:23.640625000 +0200
++++ misc/build/mysql-connector-cpp/driver/nativeapi/binding_config.h	2009-08-14 10:13:50.359375000 +0200
+@@ -1 +1,2 @@
+-dummy
++#define HAVE_DLFCN_H 1
++#define MYSQLCLIENT_STATIC_BINDING 1
diff --git a/mysqlcppconn/mysql-connector-cpp.patch b/mysqlcppconn/mysql-connector-cpp.patch
index b710504..0575653 100644
--- a/mysqlcppconn/mysql-connector-cpp.patch
+++ b/mysqlcppconn/mysql-connector-cpp.patch
@@ -350,12 +350,6 @@
  
  #include <stack>
  #include "mysql_util.h"
---- misc/mysql-connector-cpp/driver/nativeapi/binding_config.h	2009-08-14 10:17:23.640625000 +0200
-+++ misc/build/mysql-connector-cpp/driver/nativeapi/binding_config.h	2009-08-14 10:13:50.359375000 +0200
-@@ -1 +1,2 @@
--dummy
-+#define HAVE_DLFCN_H 1
-+//#define MYSQLCLIENT_STATIC_BINDING 1
 --- misc/mysql-connector-cpp/driver/nativeapi/makefile.mk	2009-08-17 21:32:53.694119382 +0200
 +++ misc/build/mysql-connector-cpp/driver/nativeapi/makefile.mk	2009-08-17 21:32:50.534346360 +0200
 @@ -1 +1,23 @@