[Libreoffice-commits] core.git: connectivity/Library_mysqlc.mk

Thu Aug 30 15:13:06 UTC 2018

connectivity/Library_mysqlc.mk |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 340bde53376dfa844270bcdf991b5f4183981bb9
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Thu Aug 30 17:10:29 2018 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Thu Aug 30 17:12:17 2018 +0200

    Revert "On macOS Library_mysqlc needs _iconv{,_close,_open}"
    
    This reverts commit a191075ee1bd103a57c935e47026337a5e2340e9.
    
    This fix was superceded by commit 13a05eec7377c013d9c13deeee6473a9e863c897
    which is better abstracted.
    
    Change-Id: I3b8ba735d279a50f5548a26fcc8fa6f790b2ea42

diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk
index e57f84aaf57f..3d9d9150b9ea 100644
--- a/connectivity/Library_mysqlc.mk
+++ b/connectivity/Library_mysqlc.mk
@@ -14,10 +14,6 @@ $(eval $(call gb_Library_use_externals,mysqlc,\
 	mariadb-connector-c \
 ))
 
-ifeq ($(OS)-$(SYSTEM_MARIADB_CONNECTOR_C),MACOSX-)
-$(eval $(call gb_Library_use_external,mysqlc,iconv))
-endif
-
 $(eval $(call gb_Library_set_include,mysqlc,\
 	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
