diff options
| author |   Keri Harris <keri@gentoo.org> | 2009-05-16 22:55:13 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2009-05-16 22:55:13 +0000 |
| commit | c06aaf06d9d375267a04be61cf49dcbd5c9d444e (patch) | |
| tree | b894abc8185e191cbfdde64b8819e45cfd35e321 /dev-lang/yap | |
| parent | Version bump. (diff) | |
| download | gentoo-2-c06aaf06d9d375267a04be61cf49dcbd5c9d444e.tar.gz gentoo-2-c06aaf06d9d375267a04be61cf49dcbd5c9d444e.tar.bz2 gentoo-2-c06aaf06d9d375267a04be61cf49dcbd5c9d444e.zip | |
Fix loading foreign files from a static Prolog kernel
(Portage version: 2.1.6.11/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/yap')
| -rw-r--r-- | dev-lang/yap/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/yap/files/yap-5.1.3-configure.patch | 6 | ||||
| -rw-r--r-- | dev-lang/yap/files/yap-5.1.3-dynamic-lib.patch | 9 |
3 files changed, 8 insertions, 13 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/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 |