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

do not require mysql-devel package at runtime when using system mysql

Browse Source 
useful for distro-specific builds
This commit is contained in:
Petr Mladek
2011-03-30 17:07:51 +02:00
parent 76f3fa1531
commit ee55ce5ba0
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysqlcppconn/makefile.mk
View File

@@ -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

6
mysqlcppconn/mysql-connector-cpp-mysql-binding-dynamic.patch Normal file
View File

@@ -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

6
mysqlcppconn/mysql-connector-cpp-mysql-binding-static.patch Normal file
View File

@@ -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

6
mysqlcppconn/mysql-connector-cpp.patch
View File

@@ -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 @@