diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-04-07 12:46:22 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-09-03 10:36:18 +0200 |
| commit | 275a9245d6406b97f6429dc523ca9ad5d40a65ec (patch) | |
| tree | 7ec4376eb56d32ea98b105d357ba54a37be708c7 | |
| parent | 8a8e4e3fc338994883fbb7db8fb9447e1f99f012 (diff) | |
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@cib.de>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 61d57bcebd1a246603cbcd9ad5e0a7df1a8d66cd)
Conflicts:
mysqlc/Library_mysqlc.mk
Change-Id: I10b56cdc1a438fb2978125ae0acde0dbec747e78
| -rw-r--r-- | connectivity/Library_mysqlc.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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,) \ )) |