summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2010-10-30 03:52:12 +0000
committerKeri Harris <keri@gentoo.org>2010-10-30 03:52:12 +0000
commit840c4992d06bfa8f955838e8d6a519f1f23ee5f4 (patch)
treebe9b46be6d625fe5218ab8973f733718ef8e67ec /dev-lang/yap
parentVersion bump and remove old. (diff)
downloadhistorical-840c4992d06bfa8f955838e8d6a519f1f23ee5f4.tar.gz
historical-840c4992d06bfa8f955838e8d6a519f1f23ee5f4.tar.bz2
historical-840c4992d06bfa8f955838e8d6a519f1f23ee5f4.zip
Add YAPLIBDIR to LD_LIBRARY_PATH when bootstrapping chr
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'dev-lang/yap')
-rw-r--r--dev-lang/yap/ChangeLog6
-rw-r--r--dev-lang/yap/Manifest5
-rw-r--r--dev-lang/yap/files/yap-6.2.0-ld-library-path.patch92
-rw-r--r--dev-lang/yap/yap-6.2.0-r1.ebuild7
4 files changed, 105 insertions, 5 deletions
diff --git a/dev-lang/yap/ChangeLog b/dev-lang/yap/ChangeLog
index 5e76b95920b6..b124cdbda836 100644
--- a/dev-lang/yap/ChangeLog
+++ b/dev-lang/yap/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/yap
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.45 2010/10/29 19:35:15 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.46 2010/10/30 03:52:12 keri Exp $
+
+ 30 Oct 2010; <keri@gentoo.org> yap-6.2.0-r1.ebuild,
+ +files/yap-6.2.0-ld-library-path.patch:
+ Add YAPLIBDIR to LD_LIBRARY_PATH when bootstrapping chr
29 Oct 2010; <keri@gentoo.org> yap-6.2.0-r1.ebuild:
Tidy up examples installation; QA - remove die from call to econf, add die
diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest
index 064ee0d4e6c0..9c4700f3c1ce 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -38,6 +38,7 @@ AUX yap-6.0.6-runpath.patch 1366 RMD160 edd0076d1838d0d0986d09208a46804af36b86e9
AUX yap-6.0.6-yapsharedir.patch 512 RMD160 fa77614a699b8ec7f766baf84a847393552e2159 SHA1 9cc44f3fa7a717bd263323194f541b4431c067a3 SHA256 15388a3a25bd62ec79afcb8cef0ca39f3ebe461e4358d31c9b75d7d09d39658d
AUX yap-6.2.0-chr-sublist.patch 1343 RMD160 f6f01ed7a4ca0cd065445c80234ce51274f0e6d2 SHA1 c541a5545fc1a9841b2e3b52ddf2e5e1ae8519b1 SHA256 8ba1b1b33476cd0fccd4d0324b0e08b69bf65809a17674f8261792af01a56b64
AUX yap-6.2.0-have-config.patch 1701 RMD160 6e7b1f498a1c78e852bb6c23963dc1b1db9ab0a7 SHA1 269e76dd89caaf58cb1e19dfb0c84078347d81c6 SHA256 09bb71de1696686bdf08e95b36b50099ae7a87d57deb5c7a97d836bb7c16de7b
+AUX yap-6.2.0-ld-library-path.patch 6191 RMD160 61ea0f065c038cbd975e162764fcf418d998164f SHA1 6263c6225cf29afc474679af3fe7578acabcb3be SHA256 387c864d70393357201fe25084cf004f4439ae51d40c1792774d7bf4fa1b823f
AUX yap-6.2.0-ldflags.patch 12983 RMD160 8e69d09a90fb82cb6ee01ebb227ceb1f40182841 SHA1 dd5169cf6396f511c058ae4aa8bc71fd16ed4761 SHA256 c0186dd2709a917cba30263eda6032ecd6c46bb5508e88974ed15e11336e69a8
AUX yap-6.2.0-parallel-make.patch 1714 RMD160 5553cfa89f526ba4e9aa9d5dbf98efb529e0f5d2 SHA1 86c921f909533331485ea56e2020604f5ff0bd66 SHA256 88604835c33eef955a9ea26e223a09bfc05fd2dc52eb29155dbf40ac385968fa
AUX yap-6.2.0-yapsharedir.patch 512 RMD160 a62a5e09c5e124e6c04857918aba810ec32d9c1c SHA1 cbc9ecfbc61d9fccb459f8fa334492b02ab9e6ca SHA256 84365ed0540714abbc77f872195f3f7287ba912350debe322be556914a75e754
@@ -57,7 +58,7 @@ EBUILD yap-6.0.4.ebuild 2282 RMD160 35eb1455778246bca7ded06d51768ca3fa654855 SHA
EBUILD yap-6.0.5-r1.ebuild 2331 RMD160 48b9cda0634b56e4cbf3f9d3f467d5ed06b7c3d1 SHA1 b7cad92f8540ab827240e5c127cac28298876042 SHA256 1eab4cd6e5273a8ffce60bf816840d85df163719cb29a45d472cded395260e2c
EBUILD yap-6.0.5.ebuild 2287 RMD160 f4ce34ff3ab33544df90e6d68dc892f0e477b0ee SHA1 cf74f88eda55b569c4d5bc7a5746572013b5cd3d SHA256 bb70ba1c75a56ae607f7d17a108db0c70b79b6bc9245a984228a52812af6c01d
EBUILD yap-6.0.6.ebuild 2416 RMD160 22ea3b1c433dfd6f30ad1a3531cf82d0f9e68821 SHA1 2550d92d5403e5ad22cce00b66bb38baec0df9c8 SHA256 8a4917829e7f79113bd713828e97e3ee708f0d46e0b95de7031558fbf179dfb8
-EBUILD yap-6.2.0-r1.ebuild 2668 RMD160 7cf19cd4839053f433f27d7fa3fd1bfd20f2c1da SHA1 b4961ac0f01614254a9806814a8741d866181575 SHA256 efc9e205c894f4c4d2a864e4f30b1de485ee2c04088273f601d2f87af29b65fb
+EBUILD yap-6.2.0-r1.ebuild 2739 RMD160 43cd8f9146403d912020db0ce2c993b7d92130f8 SHA1 ca928938362614385eb1412b23f9da870097f5b0 SHA256 3e5da6ba4cf423f6f022ac3effcfbf6392c96e4152d4c8531eda87267a641670
EBUILD yap-6.2.0.ebuild 2388 RMD160 17b05053b60ebd8214887455bc4a29e9a0c9416c SHA1 ce6158e2c7d85891bbfb4ee7533fc61448ae8952 SHA256 c6d6bf3cc79b7a0572d89988b39827d4c25e5e1edb00b952d3a2dd2870f654a7
-MISC ChangeLog 8555 RMD160 dd4dc61ab3027e8b19c6bfd2aaf2575e7eecb35b SHA1 bb47bb088866f0d519eb32e735ab43959858293b SHA256 5c22a560883b603cea6f17ff6e2a455844d0604c6bfd79abf067b17713823255
+MISC ChangeLog 8710 RMD160 d7b6706cfe026a29e320595c371b8d5f4e26f47c SHA1 46c04b0dd428f27946e9e03bb8170e0602acf053 SHA256 2214f6a5cd53555098253387f5be61365b7d3986af56f974c7b9fb94b2accfe2
MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
diff --git a/dev-lang/yap/files/yap-6.2.0-ld-library-path.patch b/dev-lang/yap/files/yap-6.2.0-ld-library-path.patch
new file mode 100644
index 000000000000..be934296655a
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.2.0-ld-library-path.patch
@@ -0,0 +1,92 @@
+--- yap-6.orig/configure.in 2010-10-18 21:48:20.000000000 +1300
++++ yap-6/configure.in 2010-10-30 10:02:49.000000000 +1300
+@@ -924,7 +924,7 @@
+ then
+ YAPLIB_LD="\$(CC) -shared"
+ EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
+- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
++ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
+ PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
+ else
+ YAPLIB_LD="\$(CC)"
+@@ -946,7 +946,7 @@
+ DYNYAPLIB=libYap."$SO"
+ EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
+ PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
+- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
++ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
+ ;;
+ *hpux*)
+ #do not use the first memory quadrant
+@@ -985,7 +985,7 @@
+ DYNYAPLIB=libYap."$SO"
+ EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
+ PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
+- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
++ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
+ ;;
+ *aix*)
+ # To actually use dlls in AIX I'd need to build YAP as a DLL first.
+@@ -998,7 +998,7 @@
+ DYNYAPLIB=libYap."$SO"
+ EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,\$(LIBDIR)"
+ PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
+- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
++ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
+ ;;
+ *osf*)
+ if ${use_condor} = no
+@@ -1016,7 +1016,7 @@
+ DYNYAPLIB=libYap."$SO"
+ EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
+ PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
+- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
++ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
+ ;;
+ *irix6*)
+ SHLIB_CFLAGS="$CFLAGS"
+@@ -1030,7 +1030,7 @@
+ DYNYAPLIB=libYap."$SO"
+ EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
+ PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
+- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
++ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
+ ;;
+ *darwin*)
+ if test ${use_dlcompat} = yes
+@@ -1051,7 +1051,7 @@
+ SHLIB_LD="$CC -dynamiclib"
+ SHLIB_CXX_LD="$CXX -dynamiclib"
+ EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-install_name,\$(YAPLIBDIR)/\$@"
+- INSTALL_ENV="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
++ INSTALL_ENV="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
+ else
+ SHLIB_LD="$CC -dynamiclib -Wl,-undefined,dynamic_lookup"
+ SHLIB_CXX_LD="$CXX -dynamiclib -Wl,-undefined,dynamic_lookup"
+@@ -1091,7 +1091,7 @@
+ DYNYAPLIB=libYap."$SO"
+ EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -Wl,-R,\$(YAPLIBDIR)"
+ PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
+- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
++ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
+ ;;
+ *solaris*)
+ #an elf system
+@@ -1110,7 +1110,7 @@
+ YAPLIB_LD="\$(CC)"
+ EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
+ PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
+- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
++ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
+ else
+ EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
+ PRE_INSTALL_ENV=""
+@@ -1165,7 +1165,7 @@
+ DYNYAPLIB=libYap."$SO"
+ EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
+ PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
+- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
++ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
+ ;;
+ esac
+
diff --git a/dev-lang/yap/yap-6.2.0-r1.ebuild b/dev-lang/yap/yap-6.2.0-r1.ebuild
index 68db2913edfb..3d1665a3b95b 100644
--- a/dev-lang/yap/yap-6.2.0-r1.ebuild
+++ b/dev-lang/yap/yap-6.2.0-r1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.2.0-r1.ebuild,v 1.3 2010/10/29 19:35:15 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.2.0-r1.ebuild,v 1.4 2010/10/30 03:52:12 keri Exp $
-inherit eutils flag-o-matic java-pkg-opt-2
+inherit autotools eutils flag-o-matic java-pkg-opt-2
DESCRIPTION="YAP is a high-performance Prolog compiler."
HOMEPAGE="http://www.ncc.up.pt/~vsc/Yap/"
@@ -31,8 +31,11 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-parallel-make.patch
epatch "${FILESDIR}"/${P}-yapsharedir.patch
epatch "${FILESDIR}"/${P}-ldflags.patch
+ epatch "${FILESDIR}"/${P}-ld-library-path.patch
epatch "${FILESDIR}"/${P}-have-config.patch
epatch "${FILESDIR}"/${P}-chr-sublist.patch
+
+ eautoconf
}
src_compile() {