diff options
author | Sam James <sam@gentoo.org> | 2021-03-25 13:13:59 +0000 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2021-03-25 13:14:30 +0000 |
commit | db9673b00c52df4cd59ed568f25e2b88dd512074 (patch) | |
tree | 4e256713e6572b83f38033dc339edbba08bb5ea4 /net-nds/openldap/files/openldap-2.4.58-slibtool.patch | |
parent | app-crypt/mit-krb5: fix build with autoconf 2.70 (diff) | |
download | gentoo-db9673b00c52df4cd59ed568f25e2b88dd512074.tar.gz gentoo-db9673b00c52df4cd59ed568f25e2b88dd512074.tar.bz2 gentoo-db9673b00c52df4cd59ed568f25e2b88dd512074.zip |
Revert "net-nds/openldap: fix build with slibtool"
This reverts commit 2f022ebed59863e745ac87005a956b0736266dfe.
May be a bug in slibtool, so let's wait for now.
Bug: https://bugs.gentoo.org/777804
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-nds/openldap/files/openldap-2.4.58-slibtool.patch')
-rw-r--r-- | net-nds/openldap/files/openldap-2.4.58-slibtool.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/net-nds/openldap/files/openldap-2.4.58-slibtool.patch b/net-nds/openldap/files/openldap-2.4.58-slibtool.patch deleted file mode 100644 index 3467248a2a79..000000000000 --- a/net-nds/openldap/files/openldap-2.4.58-slibtool.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://bugs.gentoo.org/777804 - -commit 236b3a0d91774d7032c6aaf483e8a25075f31af3 -Author: orbea <orbea@riseup.net> -Date: Wed Mar 24 21:38:55 2021 -0700 - - Fix build with --disable-static and slibtool. - -diff --git a/build/top.mk b/build/top.mk -index f542ded..f07ff77 100644 ---- a/build/top.mk -+++ b/build/top.mk -@@ -86,6 +86,11 @@ LTONLY_yes = --tag=disable-shared - LTONLY_mod = --tag=disable-static - LTONLY_MOD = $(LTONLY_$(BUILD_MOD)) - -+# static flag for modules -+STATIC_yes = -static -+STATIC_mod = -+STATIC_MOD = $(STATIC_$(BUILD_MOD)) -+ - # platform-specific libtool flags - NT_LTFLAGS_LIB = -no-undefined -avoid-version -rpath $(libdir) - NT_LTFLAGS_MOD = -no-undefined -avoid-version -rpath $(moduledir) -@@ -116,7 +121,7 @@ LTLINK_LIB = $(LIBTOOL) $(LTONLY_LIB) --mode=link \ - $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB) - - LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=compile \ -- $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c -+ $(CC) $(STATIC_MOD) $(LT_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c - - LTLINK_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=link \ - $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_MOD) |