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

[Libreoffice Gerrit user]

 mysqlc/Library_mysqlc.mk |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit a191075ee1bd103a57c935e47026337a5e2340e9
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Aug 20 18:29:41 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Aug 20 21:15:40 2018 +0200

    On macOS Library_mysqlc needs _iconv{,_close,_open}
    
    ...presumably since 3478d7453a3d65b3d8d164e8f898a0b79f005c58 "Switch from mysql
    to MariaDB C API". (And see external/mysql-connector-cpp/Library_mysqlcppconn.mk
    for a similar case.)
    
    Change-Id: I146bf83a71c59a59f7694552a31923eb1e7fe664
    Reviewed-on: https://gerrit.libreoffice.org/59336
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk
index 39c6230d2f05..8e1205c2fdb8 100644
--- a/mysqlc/Library_mysqlc.mk
+++ b/mysqlc/Library_mysqlc.mk
@@ -15,6 +15,10 @@ $(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
+
 ifeq ($(SYSTEM_MYSQL_CONNECTOR_CPP),)
 $(eval $(call gb_Library_add_libs,mysqlc,\
 	$(if $(filter-out WNT,$(OS)),$(if $(filter MACOSX SOLARIS,$(OS)),-lz -lm,\