[gentoo-commits] repo/gentoo:master commit in: app-emulation/hercules/files/

[gentoo-commits] repo/gentoo:master commit in: app-emulation/hercules/files/

[Mike Frysinger]

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
+ 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/hercules/files/

[Mike Frysinger]

commit:     7609ae8d3ee84ed7313f19f3d677f251fcb5ea50
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 07:20:04 2021 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 07:59:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7609ae8d

app-emulation/hercules: fix linking of modules with system libtool #779100

Add missing linkage to the libhercu.la module for system libtool.
This doesn't normally matter as the module is loaded by hercules
which itself is linked against libtool.

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

 app-emulation/hercules/files/hercules-3.13-unbundle-libltdl.patch | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 7aec7f602de4..11a751c1e592 100644
--- a/app-emulation/hercules/files/hercules-3.13-unbundle-libltdl.patch
+++ b/app-emulation/hercules/files/hercules-3.13-unbundle-libltdl.patch
@@ -282,7 +282,7 @@
    DYNMOD_LD_FLAGS =
    DYNMOD_LD_ADD =
    LIB_LD_FLAGS    = $(XSTATIC)    \
-@@ -295,8 +295,7 @@
+@@ -295,12 +295,11 @@
                          memrchr.c    \
                          parser.c     \
                          pttrace.c    \
@@ -292,6 +292,11 @@
  
    libhercu_la_LDFLAGS = $(LIB_LD_FLAGS)
  
+-  libhercu_la_LIBADD  = $(LDADD) libhercs.la
++  libhercu_la_LIBADD  = $(LDADD) libhercs.la $(LIB_LD_ADD)
+ 
+ #
+ # Core Hercules (shared) library
 @@ -372,8 +371,7 @@
                               memrchr.c        \
                               $(dynamic_SRC)   \