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

[Stephan Bergmann]

 mysqlc/Library_mysqlc.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 61d57bcebd1a246603cbcd9ad5e0a7df1a8d66cd
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sat Apr 7 12:46:22 2018 +0200

    Don't link Library_mysqlc against -lnsl
    
    At least Fedora 28 glibc-2.27-8.fc28 no longer provides the nis development
    headers and libraries. (It only still contains some binaries for backwards
    compatibility, in the libnsl sub-package: "This package provides the legacy
    version of libnsl library, for accessing NIS services.")
    
    The -lnsl was present ever since 4946c62f2943dfb3466cc4214a9c8ccd922669b5
    "mysqlconnector: initial import from CWS mysqlnative", but appears to not be
    necessary (at least any more).
    
    Change-Id: I10b56cdc1a438fb2978125ae0acde0dbec747e78
    Reviewed-on: https://gerrit.libreoffice.org/52536
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk
index 8eb207d4bd9e..97f2b63500a2 100644
--- a/mysqlc/Library_mysqlc.mk
+++ b/mysqlc/Library_mysqlc.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_Library_use_externals,mysqlc,\
 ifeq ($(SYSTEM_MYSQL_CONNECTOR_CPP),)
 $(eval $(call gb_Library_add_libs,mysqlc,\
 	$(if $(filter-out WNT,$(OS)),$(if $(filter MACOSX SOLARIS,$(OS)),-lz -lm,\
-	-rdynamic -lz -lcrypt -lnsl -lm)) \
+	-rdynamic -lz -lcrypt -lm)) \
 ))
 endif