diff options
| author |   Keri Harris <keri@gentoo.org> | 2010-10-30 03:52:12 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2010-10-30 03:52:12 +0000 |
| commit | 55a5b5baf4399e1d4a5617d3a8515df350d7ee46 (patch) | |
| tree | 5f9454265bcae4651d83e7cb824a4f3e4a5ea4f3 /dev-lang/yap | |
| parent | Version bump and remove old. (diff) | |
| download | gentoo-2-55a5b5baf4399e1d4a5617d3a8515df350d7ee46.tar.gz gentoo-2-55a5b5baf4399e1d4a5617d3a8515df350d7ee46.tar.bz2 gentoo-2-55a5b5baf4399e1d4a5617d3a8515df350d7ee46.zip | |
Add YAPLIBDIR to LD_LIBRARY_PATH when bootstrapping chr
(Portage version: 2.1.8.3/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-6.2.0-ld-library-path.patch | 92 | ||||
| -rw-r--r-- | dev-lang/yap/yap-6.2.0-r1.ebuild | 7 |
3 files changed, 102 insertions, 3 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/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() { |