[Libreoffice-commits] .: mysqlc/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Dec 18 08:06:39 PST 2012


 mysqlc/source/makefile.mk |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 259cdd64ac850fa9105bd21001d466a82671f75e
Author: Tomas Chvatal <tchvatal at suse.cz>
Date:   Tue Dec 18 17:05:47 2012 +0100

    Do not define CPPCONN_LIB if using system version
    
    This is used for dlopen internal library only anyway and breaks
    when building in strict-multilib environment.
    
    Change-Id: I9dea9e37161aab17ab605bec33482ddb48beeb46

diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk
index 207d785..fee18728 100644
--- a/mysqlc/source/makefile.mk
+++ b/mysqlc/source/makefile.mk
@@ -88,8 +88,6 @@ CFLAGS+=-DSYSTEM_MYSQL_CPPCONN
 CDEFS+=-DCPPDBC_EXPORTS -DCPPCONN_LIB_BUILD
 .IF "$(SYSTEM_MYSQL_CPPCONN)" != "YES"
 CDEFS += -DCPPCONN_LIB=\"$(DLLPRE)mysqlcppconn$(DLLPOST)\"
-.ELSE
-CDEFS += -DCPPCONN_LIB=\"$(shell readlink /usr/lib/libmysqlcppconn.so)\"
 .ENDIF
 
 # --------------- MySQL settings ------------------


More information about the Libreoffice-commits mailing list