[Libreoffice-commits] core.git: libmariadb/my_config.h mysqlc/Library_mysqlc.mk mysqlcppconn/Library_mysqlcppconn.mk

Fridrich Å trba fridrich.strba at bluewin.ch
Thu Mar 14 01:19:09 PDT 2013


 libmariadb/my_config.h               |    2 ++
 mysqlc/Library_mysqlc.mk             |    6 ++++++
 mysqlcppconn/Library_mysqlcppconn.mk |    6 ++++++
 3 files changed, 14 insertions(+)

New commits:
commit 77cc0cb72f88806ee13682ac868b9e468a070400
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Mar 14 09:18:37 2013 +0100

    Build thread-enabled internal libmariadb on UNX
    
    Change-Id: Ie0968b0802f5cbd9dc75906c4930586fb46d99ca

diff --git a/libmariadb/my_config.h b/libmariadb/my_config.h
index c026a27..ceed617 100644
--- a/libmariadb/my_config.h
+++ b/libmariadb/my_config.h
@@ -160,3 +160,5 @@
 
 #define RETSIGTYPE void
 #define RETQSORTTYPE void
+
+#define THREAD 1
diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk
index d67d314..fd09ba1 100644
--- a/mysqlc/Library_mysqlc.mk
+++ b/mysqlc/Library_mysqlc.mk
@@ -36,6 +36,12 @@ $(eval $(call gb_Library_use_libraries,mysqlc,\
 	cppuhelper \
 ))
 
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_libs,mysqlc,\
+	-lpthread \
+))
+endif
+
 $(eval $(call gb_Library_add_defs,mysqlc,\
 	-DCPPDBC_EXPORTS \
 	-DCPPCONN_LIB_BUILD \
diff --git a/mysqlcppconn/Library_mysqlcppconn.mk b/mysqlcppconn/Library_mysqlcppconn.mk
index 6f52a26..611895b 100644
--- a/mysqlcppconn/Library_mysqlcppconn.mk
+++ b/mysqlcppconn/Library_mysqlcppconn.mk
@@ -53,6 +53,12 @@ $(eval $(call gb_Library_set_include,mysqlcppconn,\
 	$(MARIADB_CFLAGS) \
 ))
 
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_libs,mysqlcppconn,\
+	-lpthread \
+))
+endif
+
 $(eval $(call gb_Library_add_generated_exception_objects,mysqlcppconn,\
 	UnpackedTarball/mysqlcppconn/driver/mysql_art_resultset \
 	UnpackedTarball/mysqlcppconn/driver/mysql_art_rset_metadata \


More information about the Libreoffice-commits mailing list