diff options
Diffstat (limited to 'app-emulation/hercules/files/hercules-3.13-unbundle-libltdl.patch')
| -rw-r--r-- | app-emulation/hercules/files/hercules-3.13-unbundle-libltdl.patch | 34 |
1 files changed, 33 insertions, 1 deletions
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..c96831d96ad2 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) \ @@ -345,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 + |