Fix loading foreign files from a static Prolog kernel

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

4 files changed, 11 insertions, 16 deletions

diff --git a/dev-lang/yap/ChangeLog b/dev-lang/yap/ChangeLog
index 5c689814b390..c6b75835ed44 100644
--- a/dev-lang/yap/ChangeLog
+++ b/dev-lang/yap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/yap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.26 2009/03/02 00:27:35 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.27 2009/05/16 22:55:13 keri Exp $
+
+  16 May 2009; <keri@gentoo.org> files/yap-5.1.3-configure.patch,
+  files/yap-5.1.3-dynamic-lib.patch:
+  Fix loading foreign files from a static Prolog kernel.
 
 *yap-5.1.3-r2 (02 Mar 2009)
 
diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest
index 31a26097227f..8620b1800586 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -21,8 +21,8 @@ AUX yap-5.1.3-bootdir.patch 1453 RMD160 c70a43f6ef4700752d7dfa47e20c6c3bf9cab23b
 AUX yap-5.1.3-chr.patch 5543 RMD160 717bd154f58890ad6fbb53cfeec00d110b8bcf8a SHA1 a6d71a8b8a100bb886859793788b22f8945ce19f SHA256 981d30f467a99112b63a17b31df6173383711934c47771286d8378fb0e4b8f58
 AUX yap-5.1.3-clpbn-examples.patch 835 RMD160 dd586e555724d877b5161db7f3ac78b808ccf848 SHA1 a529a9a0c410596cb145ae89f353152c26250b3d SHA256 b88257ed78058dda4cce9559be502b6e0ecc99c446174cc88e844ec9cf3e8bfd
 AUX yap-5.1.3-config.h.patch 487 RMD160 ce256423d19639fce07aa4f768695c00957aa896 SHA1 f58d719775e1a9ad726e5b87dde921a9f2999dd7 SHA256 68142cf4196b1e83de47feb654e223076f8b2d1d482d4700b64becc54681bc8a
-AUX yap-5.1.3-configure.patch 6344 RMD160 044a25bdf173878c714ba415dde8945e4b024832 SHA1 5605079284fa0a76ef303801f7a8998f2501a52d SHA256 00543c065f54d629c5b7b9307a3b6ac5186d69e4200788e76ce1cd7f68a0c6e3
-AUX yap-5.1.3-dynamic-lib.patch 761 RMD160 b31c9763b8714aca0753227469ab156ecdc830da SHA1 6c3ea587ce44d528e9c299c000b1e6deb8440443 SHA256 8eb551710f8a0c9aba5d23a61b9d07ff7043d0c895e80061af8cd9b2cc821662
+AUX yap-5.1.3-configure.patch 6289 RMD160 35cc3d649ededf83699bb5a09a0621aab0eedb9f SHA1 b0382e91e24555a685a250bada0049f02e2766d7 SHA256 3894df3502bdbc2bb72f716beef02aedb4d6840a06b91d6217242882f2ee3ba5
+AUX yap-5.1.3-dynamic-lib.patch 359 RMD160 a48df22ebf9984f2f6903435db2d8e3d56da234c SHA1 e87e5e492a9cf054f54abcbdf0ee655596bf914c SHA256 7221998b9fe1dbdfd4ac621ac52e60212c0e7bb89afac0032e95eaac5f008e6e
 AUX yap-5.1.3-fortify_sources-ubuntu.patch 910 RMD160 00518b6ffbe4a3119821799f86babf7ff3219a87 SHA1 0daa744ba7ff36da46dd9f246b2410784d248f4a SHA256 e8bbbbffbffc08d6920fcc630180401c0dbe942a158ae2ab89f6e23da239a317
 AUX yap-5.1.3-multilib.patch 10161 RMD160 d19b31c8b9a7b4c71165f6397076be3ed75d1112 SHA1 0225e01a9fb1b27b0f5e4df62e3c6251e62c4d78 SHA256 5a07da0160c8e5d56e2902e162a5bb4eb1e1027f7e78f8ff041fa025770ce06e
 AUX yap-5.1.3-parallel-make.patch 6384 RMD160 b5f107a748b4d13832dfc9f7f1446f4b90e6317c SHA1 d7a0b16cbd0a843a5c96bd6dcee901f383d92db0 SHA256 99edc0a21ccb7354437c43b66dea6b264c3764c3c748b6c441d70112b885414b
@@ -35,5 +35,5 @@ EBUILD yap-5.1.2.ebuild 2408 RMD160 dd3d262d1afc625ff3e0d472e7a68ff72d83be7f SHA
 EBUILD yap-5.1.3-r1.ebuild 2382 RMD160 badd66614fe4b52962d06e3a71605cedb4b65e9f SHA1 8640cd4abfcf3318bcba909da224cb8def8ae249 SHA256 4c23d83b9d5ec078a9db1ed6879e4dc3ab1be05b63ead94c9c88ff1645e43d6a
 EBUILD yap-5.1.3-r2.ebuild 2441 RMD160 dd698ee90cba56dca425f8117bddaf6c2c4c3723 SHA1 766dac2277b9ca43fa12b8438053c012f07133a4 SHA256 8cce0f9bfa73353fc2f4872f77ccb60c64b4a74019523fb531f43c41a48fa976
 EBUILD yap-5.1.3.ebuild 1990 RMD160 df46e51344c9d6641393ceab8ab8ff33e72d916e SHA1 48500d59348987856eefb5df236f130ea24f21f0 SHA256 c907e4c09b343143bfbc27388b6608e8718cac97f1ed2e13e8f94907edfe540c
-MISC ChangeLog 4590 RMD160 78d4043af506ff92b8fdc72a9105d24a9c96d694 SHA1 87e161fd8d4876f73d51b1e57bb229c230d30e9e SHA256 89fb188663a208d4d354219807cc6fceb139d34d7ae5e5941f6760095146f44a
+MISC ChangeLog 4748 RMD160 717bb8be7b8511f0e6d1b5b85273fc8957e8d650 SHA1 612853930ff524ca56c4dac235c0ab8737a04f0a SHA256 7e9c53e8634275e0c1499aaaff0bba88281fc4d79973ab8096bfe5549f01d821
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
diff --git a/dev-lang/yap/files/yap-5.1.3-configure.patch b/dev-lang/yap/files/yap-5.1.3-configure.patch
index b31a0a662d4b..37cf36c6b6ad 100644
--- a/dev-lang/yap/files/yap-5.1.3-configure.patch
+++ b/dev-lang/yap/files/yap-5.1.3-configure.patch
@@ -182,12 +182,12 @@
          JAVA_TARGET=sparc
          ;;
         esac
--    LDFLAGS="$LDFLAGS -Wl,-R,$prefix/lib  -Wl,-R,$JAVA_HOME/jre/lib/$JAVA_TARGET"
+     LDFLAGS="$LDFLAGS -Wl,-R,$prefix/lib  -Wl,-R,$JAVA_HOME/jre/lib/$JAVA_TARGET"
 +    EXTEND_DYNLOADER_PATH="LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR)/Yap YAPBOOTDIR=\$(DESTDIR)\$(SHAREDIR)/Yap/pl YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
      DYNYAPLIB=libYap"$SHLIB_SUFFIX"
-+    LDFLAGS="$LDFLAGS -Wl,-R,$prefix/lib -Wl,-R,$JAVA_HOME/jre/lib/$JAVA_TARGET -Wl,-soname=$DYNYAPLIB"
      YAPLIB="$DYNYAPLIB"
-     DYNLIB_LD="$SHLIB_LD"
+-    DYNLIB_LD="$SHLIB_LD"
++    DYNLIB_LD="$SHLIB_LD -Wl,-soname=$DYNYAPLIB"
      ;;
    esac
  else
diff --git a/dev-lang/yap/files/yap-5.1.3-dynamic-lib.patch b/dev-lang/yap/files/yap-5.1.3-dynamic-lib.patch
index 0360b4a37e59..fd6739f77b64 100644
--- a/dev-lang/yap/files/yap-5.1.3-dynamic-lib.patch
+++ b/dev-lang/yap/files/yap-5.1.3-dynamic-lib.patch
@@ -1,14 +1,5 @@
 --- Yap-5.1.3.orig/Makefile.in	2008-06-05 02:47:18.000000000 +1200
 +++ Yap-5.1.3/Makefile.in	2009-01-25 10:13:15.000000000 +1300
-@@ -579,7 +579,7 @@
- 	echo "bootstrap('$(srcdir)/pl/init.yap'). module(user). save_program(startup)." |  @CROSS_SIMULATOR@ ./yap -b $(srcdir)/pl/boot.yap
- 
- yap@EXEC_SUFFIX@: $(HEADERS) yap.o @YAPLIB@
--	$(MPI_CC) $(STANDARD_CFLAGS) $(LDFLAGS) -o yap yap.o @YAPLIB@ $(LIBS) @MPI_LIBS@
-+	$(MPI_CC) $(STANDARD_CFLAGS) -o yap yap.o @YAPLIB@ $(LIBS) @MPI_LIBS@
- 
- libYap.a: $(LIB_OBJECTS)
- 	-rm -f libYap.a
 @@ -587,7 +587,7 @@
  	$(RANLIB) libYap.a