commit:     e93a59e8449cc696897529bda6e40076e0f7bc75
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 07:43:44 2021 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 07:59:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e93a59e8

app-emulation/hercules: fix ./libtool not fond warnings #791859

Use simpler logic to find shared library info, and use the system
libtool to compile the test programs.  This shouldn't really matter
in practice as this test was defaulting to "no" when the code wasn't
working correctly, and now that it is, it still ends up as "no" as
the hack shouldn't be needed on Linux systems with good shared lib
infrastructure.

Bug: https://bugs.gentoo.org/252716
Closes: https://bugs.gentoo.org/791859
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 .../files/hercules-3.13-unbundle-libltdl.patch     | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/app-emulation/hercules/files/hercules-3.13-unbundle-libltdl.patch 
b/app-emulation/hercules/files/hercules-3.13-unbundle-libltdl.patch
index 11a751c1e592..c96831d96ad2 100644
--- a/app-emulation/hercules/files/hercules-3.13-unbundle-libltdl.patch
+++ b/app-emulation/hercules/files/hercules-3.13-unbundle-libltdl.patch
@@ -350,3 +350,30 @@
    LIB_LD_FLAGS    = $(XSTATIC)    \
                   -no-undefined \
                   -avoid-version
+--- a/autoconf/hercules.m4
++++ b/autoconf/hercules.m4
+@@ -270,7 +270,7 @@
+ 
+     else
+ 
+-        if test $(./libtool --features | fgrep "enable shared libraries" | wc 
-l) -ne 1; then
++        if test "$enable_shared" != "yes"; then
+ 
+             #  Libtool doesn't support shared libraries,
+             #  and thus our wrapper kludge is not needed.
+@@ -280,11 +280,11 @@
+                 }
+ DUPGETOPT2
+ 
+-            ./libtool --mode=compile ${CC-cc} conftest1.c -c -o conftest1.lo 
> /dev/null 2>&1
+-            ./libtool --mode=compile ${CC-cc} conftest2.c -c -o conftest2.lo 
> /dev/null 2>&1
++            libtool --mode=compile ${CC-cc} conftest1.c -c -o conftest1.lo > 
/dev/null 2>&1
++            libtool --mode=compile ${CC-cc} conftest2.c -c -o conftest2.lo > 
/dev/null 2>&1
+ 
+-            ./libtool --mode=link ${CC-cc} -shared -rpath /lib -no-undefined 
conftest1.lo                 -o libconftest1.la > /dev/null 2>&1
+-            ./libtool --mode=link ${CC-cc} -shared -rpath /lib -no-undefined 
conftest2.lo libconftest1.la -o libconftest2.la > /dev/null 2>&1
++            libtool --mode=link ${CC-cc} -shared -rpath /lib -no-undefined 
conftest1.lo                 -o libconftest1.la > /dev/null 2>&1
++            libtool --mode=link ${CC-cc} -shared -rpath /lib -no-undefined 
conftest2.lo libconftest1.la -o libconftest2.la > /dev/null 2>&1
+ 
+             if test $? = 0; then
+ 

Reply via email to