[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - connectivity/Library_mysqlc.mk

[Libreoffice Gerrit user]

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

New commits:
commit 275a9245d6406b97f6429dc523ca9ad5d40a65ec
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sat Apr 7 12:46:22 2018 +0200
Commit:     Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Mon Sep 3 10:36:18 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).
    
    Reviewed-on: https://gerrit.libreoffice.org/52536
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Tested-by: Jenkins <ci at libreoffice.org>
    (cherry picked from commit 61d57bcebd1a246603cbcd9ad5e0a7df1a8d66cd)
    
    Conflicts:
            mysqlc/Library_mysqlc.mk
    
    Change-Id: I10b56cdc1a438fb2978125ae0acde0dbec747e78

diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk
index 26add5bee4cc..e57f84aaf57f 100644
--- a/connectivity/Library_mysqlc.mk
+++ b/connectivity/Library_mysqlc.mk
@@ -27,7 +27,7 @@ $(eval $(call gb_Library_set_include,mysqlc,\
 
 $(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)) \
 	$(if $(filter LINUX,$(OS)),-lpthread -ldl,) \
 ))