Add patch to correctly link dynamic Yap

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27-gentoo-r8 x86_64

5 files changed, 86 insertions, 12 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/Manifest b/dev-lang/yap/Manifest
index 792fa76750c3..cd6a8ed5a124 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -21,7 +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 4729 RMD160 6b5db281a38ac11dbae8fc7d146e22f2feb16b3a SHA1 e78084e4b714160342f6e8f6dae256c1b236043c SHA256 63e07e10eb266afc3c26b2e54cef2607c19430cbcfa09559ed05620c88409ac3
+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-multilib.patch 10161 RMD160 d19b31c8b9a7b4c71165f6397076be3ed75d1112 SHA1 0225e01a9fb1b27b0f5e4df62e3c6251e62c4d78 SHA256 5a07da0160c8e5d56e2902e162a5bb4eb1e1027f7e78f8ff041fa025770ce06e
 AUX yap-5.1.3-parallel-make.patch 6384 RMD160 b5f107a748b4d13832dfc9f7f1446f4b90e6317c SHA1 d7a0b16cbd0a843a5c96bd6dcee901f383d92db0 SHA256 99edc0a21ccb7354437c43b66dea6b264c3764c3c748b6c441d70112b885414b
 AUX yap-5.1.3-tkyap.patch 695 RMD160 a723ec3962b2072b64fd045f424d3c7a1b1f0b03 SHA1 e04ea927dab423b358e025c563fcc7179fdf7cc5 SHA256 58f6b3314b7091f3abbf9f378dc65018390c91a6e3578d4a7826c7b49c5eb319
@@ -30,7 +31,7 @@ DIST Yap-5.1.2.tar.gz 4102453 RMD160 be2f814a516a1b389bb910121af35898253f9137 SH
 DIST Yap-5.1.3.tar.gz 3266063 RMD160 b2e1153c7a6853a4814a672992d2b8b3834796bc SHA1 76c84b32ad8fbe8324a1db370f8440be11398c34 SHA256 61a5827452f21a7077e2b51b530a7f1b91bfcef06b28d62df53c29d986032aa9
 EBUILD yap-5.1.1.ebuild 2316 RMD160 66111b5c38d11a207f349cfd145ef1d3a26e389e SHA1 df3936df65a1dc2d489598851d9408750bb3cf2e SHA256 5f629dea7355275571629a5df397e1d6db756b55b6b7285bba6132e778973e72
 EBUILD yap-5.1.2.ebuild 2408 RMD160 dd3d262d1afc625ff3e0d472e7a68ff72d83be7f SHA1 dbeb27e9943a160540cdb3c009aeb78f5c96321f SHA256 3f6cceb286271a1f391666df2fb0b069b61e44e05f61e52a8e5ad91d603ca120
-EBUILD yap-5.1.3-r1.ebuild 2337 RMD160 9ca0e2307df040f604d885c63207cbfaa6b7639e SHA1 37cc7f651e76de0ec7fcef2f6d56423b6f2082c3 SHA256 b644e72bd5d8db238b4f2c99298003f190b64e2897ea2200123262b0a43e8980
+EBUILD yap-5.1.3-r1.ebuild 2382 RMD160 badd66614fe4b52962d06e3a71605cedb4b65e9f SHA1 8640cd4abfcf3318bcba909da224cb8def8ae249 SHA256 4c23d83b9d5ec078a9db1ed6879e4dc3ab1be05b63ead94c9c88ff1645e43d6a
 EBUILD yap-5.1.3.ebuild 1990 RMD160 df46e51344c9d6641393ceab8ab8ff33e72d916e SHA1 48500d59348987856eefb5df236f130ea24f21f0 SHA256 c907e4c09b343143bfbc27388b6608e8718cac97f1ed2e13e8f94907edfe540c
-MISC ChangeLog 4187 RMD160 b891a5c590911b14047cbee4074d8cd4e1662b77 SHA1 6a4b05dbe57355dc92bfbc5fd63ba1cc2a2c1428 SHA256 dca652a2173e5235bda944ace33ed8ec1d4d15c12ae6ed0e478be5fe37a1a20a
+MISC ChangeLog 4356 RMD160 bab51db9cd466f9272f25210e9e13fe9911da195 SHA1 a978e1a72a38e73d8a988dd04c0d0c805d00b3d8 SHA256 ea889f0076ec0aa8288de8e4b70e8086873ef93de749a68f18a07ff305015ca1
 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 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