diff options
author | Keri Harris <keri@gentoo.org> | 2009-01-24 21:24:09 +0000 |
---|---|---|
committer | Keri Harris <keri@gentoo.org> | 2009-01-24 21:24:09 +0000 |
commit | 1b9b9049eb9edf96222b26ec4e32869a9c7a8349 (patch) | |
tree | e1310dd95d0a45b2e2c247df8d693045adc962b3 /dev-lang/yap | |
parent | Version bump to resolve bug #246196 - bison 2.4 related compile failures. (diff) | |
download | gentoo-2-1b9b9049eb9edf96222b26ec4e32869a9c7a8349.tar.gz gentoo-2-1b9b9049eb9edf96222b26ec4e32869a9c7a8349.tar.bz2 gentoo-2-1b9b9049eb9edf96222b26ec4e32869a9c7a8349.zip |
Add patch to correctly link dynamic Yap
(Portage version: 2.1.6.4/cvs/Linux 2.6.27-gentoo-r8 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 | 62 | ||||
-rw-r--r-- | dev-lang/yap/files/yap-5.1.3-dynamic-lib.patch | 20 | ||||
-rw-r--r-- | dev-lang/yap/yap-5.1.3-r1.ebuild | 3 |
4 files changed, 82 insertions, 9 deletions
diff --git a/dev-lang/yap/ChangeLog b/dev-lang/yap/ChangeLog index cdb502f3c537..093cee26acaf 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.24 2009/01/17 03:30:43 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.25 2009/01/24 21:24:09 keri Exp $ + + 24 Jan 2009; <keri@gentoo.org> files/yap-5.1.3-configure.patch, + +files/yap-5.1.3-dynamic-lib.patch, yap-5.1.3-r1.ebuild: + Add patch to correctly link dynamic Yap. 17 Jan 2009; <keri@gentoo.org> +files/yap-5.1.3-clpbn-examples.patch, yap-5.1.3-r1.ebuild: 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 dab676f4726d..b31a0a662d4b 100644 --- a/dev-lang/yap/files/yap-5.1.3-configure.patch +++ b/dev-lang/yap/files/yap-5.1.3-configure.patch @@ -1,5 +1,5 @@ --- Yap-5.1.3.orig/configure.in 2008-05-24 10:29:52.000000000 +1200 -+++ Yap-5.1.3/configure.in 2008-07-27 16:51:01.000000000 +1200 ++++ Yap-5.1.3/configure.in 2009-01-25 10:00:30.000000000 +1300 @@ -95,22 +95,35 @@ fi, [yap_cv_gmp=yes]) @@ -63,7 +63,15 @@ dnl threads=yes elif test "$withval" = no; then yap_cv_jpl=no -@@ -432,6 +443,8 @@ +@@ -261,7 +272,6 @@ + fi, + [yap_cv_max_threads="1024"]) + +- + if test "$tabling" = yes -o "$orparallelism" = yes -o "$threads" = yes + then + AC_DEFINE(MinHeapSpace, (1000*SIZEOF_INT_P)) +@@ -432,6 +442,8 @@ AC_PATH_PROG(INSTALL_INFO,install-info,true,$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin) AC_PATH_PROG(SHELL,sh) @@ -72,7 +80,7 @@ dnl Check for libraries. dnl mingw does not get along well with libm dnl cygnus and mingw32 also need wsock32 to use sockets. -@@ -488,7 +501,7 @@ +@@ -488,7 +500,7 @@ AC_CHECK_LIB(gmp,main) fi @@ -81,7 +89,7 @@ then dnl check for mysql AC_MSG_CHECKING(for main in -lmysqlclient) -@@ -505,9 +518,26 @@ +@@ -505,9 +517,26 @@ if test "$yap_mysql" = yes then YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_MYSQL" @@ -110,7 +118,7 @@ dnl check for odbc AC_MSG_CHECKING(for main in -lodbc) AC_CACHE_VAL(yap_odbc,[ -@@ -526,40 +556,21 @@ +@@ -526,40 +555,21 @@ YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_ODBC" LIBS="$LIBS -lodbc " fi @@ -155,7 +163,47 @@ if test "$myddasstats" = "yes" then -@@ -1002,7 +1013,6 @@ +@@ -854,10 +864,14 @@ + YAP_EXTRAS="$SHLIB_CFLAGS $YAP_EXTRAS" + CROSS_SIMULATOR="LD_LIBRARY_PATH=." + case "$target_os" in ++ *cygwin*!*mingw32*) ++ EXTEND_DYNLOADER_PATH="" ++ ;; + *darwin*) + DYNYAPLIB=libYap"$SHLIB_SUFFIX" + YAPLIB="$DYNYAPLIB" + DYNLIB_LD="gcc -dynamiclib" ++ EXTEND_DYNLOADER_PATH="DYLD_LIBRARY_PATH=\$DYLD_LIBRARY_PATH:\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR)/Yap YAPBOOTDIR=\$(DESTDIR)\$(SHAREDIR)/Yap/pl YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" + ;; + *) + case "$target_cpu" in +@@ -871,13 +885,15 @@ + JAVA_TARGET=sparc + ;; + esac +- 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" + ;; + esac + else ++ EXTEND_DYNLOADER_PATH="YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR)/Yap YAPBOOTDIR=\$(DESTDIR)\$(SHAREDIR)/Yap/pl YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" + DYNYAPLIB=libYap.notused + fi + +@@ -992,6 +1008,7 @@ + ENABLE_CPLINT="#" + fi + AC_SUBST(ENABLE_CPLINT) ++AC_SUBST(EXTEND_DYNLOADER_PATH) + + # LAM + OLD_CC=${CC} +@@ -1002,7 +1019,6 @@ CC=${OLD_CC} dnl Checks for header files. @@ -163,7 +211,7 @@ AC_HEADER_SYS_WAIT AC_CHECK_HEADERS(arpa/inet.h ctype.h direct.h dirent.h dlfcn.h) AC_CHECK_HEADERS(errno.h fcntl.h) -@@ -1021,7 +1031,7 @@ +@@ -1021,7 +1037,7 @@ then AC_CHECK_HEADERS(gmp.h) fi 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 new file mode 100644 index 000000000000..0360b4a37e59 --- /dev/null +++ b/dev-lang/yap/files/yap-5.1.3-dynamic-lib.patch @@ -0,0 +1,20 @@ +--- 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 + + @DYNYAPLIB@: $(LIB_OBJECTS) +- @DYNLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLGS) ++ @DYNLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLAGS) + + install: install_bin install_data + diff --git a/dev-lang/yap/yap-5.1.3-r1.ebuild b/dev-lang/yap/yap-5.1.3-r1.ebuild index 81d3a0704599..b98befdc0c11 100644 --- a/dev-lang/yap/yap-5.1.3-r1.ebuild +++ b/dev-lang/yap/yap-5.1.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-5.1.3-r1.ebuild,v 1.2 2009/01/17 03:30:43 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-5.1.3-r1.ebuild,v 1.3 2009/01/24 21:24:09 keri Exp $ inherit autotools eutils java-pkg-opt-2 @@ -35,6 +35,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-configure.patch epatch "${FILESDIR}"/${P}-multilib.patch epatch "${FILESDIR}"/${P}-parallel-make.patch + epatch "${FILESDIR}"/${P}-dynamic-lib.patch epatch "${FILESDIR}"/${P}-bootdir.patch epatch "${FILESDIR}"/${P}-chr.patch epatch "${FILESDIR}"/${P}-clpbn-examples.patch |