Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-lang
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2006-06-04 08:50:57 +0000
committerKeri Harris <keri@gentoo.org>2006-06-04 08:50:57 +0000
commitb064a24f87cf44c296950b2ab33e8dc8f6635f1a (patch)
treed21e3ab0c4241dbbaf3d3e684ab85ea689de5144 /dev-lang
parentFixed --libdir configure option not being effective and tcltk USE flag issue ... (diff)
downloadgentoo-2-b064a24f87cf44c296950b2ab33e8dc8f6635f1a.tar.gz
gentoo-2-b064a24f87cf44c296950b2ab33e8dc8f6635f1a.tar.bz2
gentoo-2-b064a24f87cf44c296950b2ab33e8dc8f6635f1a.zip
Support multilib install targets.
(Portage version: 2.1_rc3-r5)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/swi-prolog/ChangeLog8
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-PLBASE.patch115
-rw-r--r--dev-lang/swi-prolog/swi-prolog-5.6.10.ebuild5
-rw-r--r--dev-lang/swi-prolog/swi-prolog-5.6.11.ebuild5
-rw-r--r--dev-lang/swi-prolog/swi-prolog-5.6.12.ebuild5
-rw-r--r--dev-lang/swi-prolog/swi-prolog-5.6.8.ebuild5
-rw-r--r--dev-lang/swi-prolog/swi-prolog-5.6.9.ebuild5
7 files changed, 142 insertions, 6 deletions
diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog
index 301af82928c2..ba02cd379625 100644
--- a/dev-lang/swi-prolog/ChangeLog
+++ b/dev-lang/swi-prolog/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-lang/swi-prolog
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.12 2006/05/23 11:24:23 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.13 2006/06/04 08:50:57 keri Exp $
+
+ 04 Jun 2006; Keri Harris <keri@gentoo.org> +files/swi-prolog-PLBASE.patch,
+ swi-prolog-5.6.8.ebuild, swi-prolog-5.6.9.ebuild,
+ swi-prolog-5.6.10.ebuild, swi-prolog-5.6.11.ebuild,
+ swi-prolog-5.6.12.ebuild:
+ Support multilib install targets.
23 May 2006; Keri Harris <keri@gentoo.org> swi-prolog-5.6.8.ebuild,
swi-prolog-5.6.9.ebuild, swi-prolog-5.6.10.ebuild,
diff --git a/dev-lang/swi-prolog/files/swi-prolog-PLBASE.patch b/dev-lang/swi-prolog/files/swi-prolog-PLBASE.patch
new file mode 100644
index 000000000000..25a3987e0d1e
--- /dev/null
+++ b/dev-lang/swi-prolog/files/swi-prolog-PLBASE.patch
@@ -0,0 +1,115 @@
+diff -ur pl-5.6.8.orig/packages/C-sicstus/Makefile.in pl-5.6.8/packages/C-sicstus/Makefile.in
+--- pl-5.6.8.orig/packages/C-sicstus/Makefile.in 2001-01-22 06:55:23.000000000 +1300
++++ pl-5.6.8/packages/C-sicstus/Makefile.in 2006-06-04 13:23:31.000000000 +1200
+@@ -9,7 +9,7 @@
+ SP_PATH=@SP_PATH@
+ RANLIB=@RANLIB@
+ AR=@AR@
+-LIBDIR=$(prefix)/lib
++LIBDIR=@libdir@
+ INCLDIR=$(prefix)/include
+
+ CC=@CC@
+diff -ur pl-5.6.8.orig/packages/ltx2htm/Makefile.in pl-5.6.8/packages/ltx2htm/Makefile.in
+--- pl-5.6.8.orig/packages/ltx2htm/Makefile.in 2005-12-02 21:53:05.000000000 +1300
++++ pl-5.6.8/packages/ltx2htm/Makefile.in 2006-06-04 13:35:36.000000000 +1200
+@@ -17,6 +17,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
++libdir=@libdir@
+
+ CC=@CC@
+ COFLAGS=@COFLAGS@
+@@ -33,7 +34,7 @@
+ INSTALL_DATA=@INSTALL_DATA@
+
+ # Don't change, this is also in latex2html.in!
+-LIBDIR=$(prefix)/lib/latex2html
++LIBDIR=$(libdir)/latex2html
+
+ OBJ= tex.o psfile.o
+ LIB= latex2html.pl latex.cmd pl.pl pl.cmd xpce.pl xpce.cmd
+diff -ur pl-5.6.8.orig/packages/Makefile.in pl-5.6.8/packages/Makefile.in
+--- pl-5.6.8.orig/packages/Makefile.in 2005-11-13 03:15:23.000000000 +1300
++++ pl-5.6.8/packages/Makefile.in 2006-06-04 13:25:56.000000000 +1200
+@@ -28,9 +28,10 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
++libdir=@libdir@
+ PL=@PL@@RT@
+ PLVERSION=@PLVERSION@
+-PLBASE=$(prefix)/lib/@PL@-$(PLVERSION)
++PLBASE=$(libdir)/@PL@-$(PLVERSION)
+ PKGDOC=$(PLBASE)/doc/packages
+ PLLIBS=@LIBS@
+ PLARCH=@ARCH@
+diff -ur pl-5.6.8.orig/src/configure.in pl-5.6.8/src/configure.in
+--- pl-5.6.8.orig/src/configure.in 2006-03-13 23:06:55.000000000 +1300
++++ pl-5.6.8/src/configure.in 2006-06-04 13:34:13.000000000 +1200
+@@ -136,11 +136,10 @@
+
+
+ dnl ****************************************************************
+-dnl Setup PLBASE. Need to expand prefix first as this isn't yet set. Yek
++dnl Setup PLBASE. No need to expand libdir as this is already set.
+ dnl ****************************************************************
+
+-test "x$prefix" = xNONE && prefix=$ac_default_prefix
+-PLBASE=$prefix/lib/$PL-$PLVERSION
++PLBASE=$libdir/$PL-$PLVERSION
+
+ dnl ****************************************************************
+ dnl Checking for GNU make vpath construct
+diff -ur pl-5.6.8.orig/src/Makefile.in pl-5.6.8/src/Makefile.in
+--- pl-5.6.8.orig/src/Makefile.in 2006-02-04 04:38:51.000000000 +1300
++++ pl-5.6.8/src/Makefile.in 2006-06-04 13:18:45.000000000 +1200
+@@ -36,6 +36,7 @@
+ srcdir=@srcdir@
+ @VPATH@ @srcdir@
+ bindir=@bindir@
++libdir=@libdir@
+ mandir=@mandir@
+ mansec=1
+ lmansec=3
+@@ -46,7 +47,7 @@
+ PLVERSION=@PLVERSION@
+ PL=@PL@@RT@
+ PLV=@PL@@RT@-@PLVERSION@
+-PLBASE=$(prefix)/lib/@PL@@RT@-@PLVERSION@
++PLBASE=$(libdir)/@PL@@RT@-@PLVERSION@
+ BOOTFILE=@BOOTFILE@
+
+ CC=@CC@
+@@ -349,7 +350,7 @@
+ $(INSTALL_DATA) libplimp.a $(DESTDIR)$(PLBASE)/lib/$(ARCH)
+
+ idirs::
+- if [ ! -d $(DESTDIR)$(prefix)/lib ]; then $(MKDIR) $(DESTDIR)$(prefix)/lib; fi
++ if [ ! -d $(DESTDIR)$(libdir) ]; then $(MKDIR) $(DESTDIR)$(libdir); fi
+ if [ ! -d $(DESTDIR)$(PLBASE) ]; then $(MKDIR) $(DESTDIR)$(PLBASE); fi
+ for d in $(installdirs); do \
+ if [ ! -d $(DESTDIR)$(PLBASE)/$$d ]; then \
+@@ -412,7 +413,7 @@
+ # runtime-only environment installation
+ #
+
+-RTHOME= $(DESTDIR)$(prefix)/lib/$(PLV)
++RTHOME= $(DESTDIR)$(libdir)/$(PLV)
+ RTDIRS= $(RTHOME) $(RTHOME)/bin $(RTHOME)/lib $(RTHOME)/lib/$(ARCH) \
+ $(RTHOME)/man $(RTHOME)/bin/$(ARCH) $(RTHOME)/include
+
+diff -ur pl-5.6.8.orig/src/rc/Makefile.in pl-5.6.8/src/rc/Makefile.in
+--- pl-5.6.8.orig/src/rc/Makefile.in 2005-09-24 00:02:05.000000000 +1200
++++ pl-5.6.8/src/rc/Makefile.in 2006-06-04 13:21:38.000000000 +1200
+@@ -18,7 +18,8 @@
+ srcdir=@srcdir@
+ @VPATH@ @srcdir@
+ bindir=$(exec_prefix)/bin
+-PLBASE=$(prefix)/lib/@PL@-$(PLVERSION)
++libdir=@libdir@
++PLBASE=$(libdir)/@PL@-$(PLVERSION)
+ man_prefix=$(prefix)/man
+ mansec=1
+ lmansec=3
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.10.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.10.ebuild
index 644d445e9cb6..2488c232add2 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.10.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.10.ebuild,v 1.3 2006/05/23 11:24:23 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.10.ebuild,v 1.4 2006/06/04 08:50:57 keri Exp $
inherit autotools eutils flag-o-matic
@@ -40,6 +40,7 @@ src_unpack() {
sed -i -e "s/man boot library/boot library/" src/Makefile.in
epatch "${FILESDIR}"/${PN}-CFLAGS.patch
+ epatch "${FILESDIR}"/${PN}-PLBASE.patch
epatch "${FILESDIR}"/${PN}-test.patch
if ! use minimal ; then
@@ -66,6 +67,7 @@ src_compile() {
cd "${S}"/src
econf \
+ --libdir=/usr/$(get_libdir) \
${threadconf} \
$(use_enable gmp) \
$(use_enable readline) \
@@ -85,6 +87,7 @@ src_compile() {
cd "${S}/packages"
econf \
+ --libdir=/usr/$(get_libdir) \
${threadconf} \
$(use_enable !static shared) \
--without-C-sicstus \
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.11.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.11.ebuild
index 8a43ec955681..c658f6848ac2 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.11.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.11.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.11.ebuild,v 1.3 2006/05/23 11:24:23 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.11.ebuild,v 1.4 2006/06/04 08:50:57 keri Exp $
inherit autotools eutils flag-o-matic
@@ -40,6 +40,7 @@ src_unpack() {
sed -i -e "s/man boot library/boot library/" src/Makefile.in
epatch "${FILESDIR}"/${PN}-CFLAGS.patch
+ epatch "${FILESDIR}"/${PN}-PLBASE.patch
epatch "${FILESDIR}"/${PN}-test.patch
if ! use minimal ; then
@@ -66,6 +67,7 @@ src_compile() {
cd "${S}"/src
econf \
+ --libdir=/usr/$(get_libdir) \
${threadconf} \
$(use_enable gmp) \
$(use_enable readline) \
@@ -85,6 +87,7 @@ src_compile() {
cd "${S}/packages"
econf \
+ --libdir=/usr/$(get_libdir) \
${threadconf} \
$(use_enable !static shared) \
--without-C-sicstus \
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.12.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.12.ebuild
index cfe21d5eea86..207167ddb063 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.12.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.12.ebuild,v 1.3 2006/05/23 11:24:23 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.12.ebuild,v 1.4 2006/06/04 08:50:57 keri Exp $
inherit autotools eutils flag-o-matic
@@ -40,6 +40,7 @@ src_unpack() {
sed -i -e "s/man boot library/boot library/" src/Makefile.in
epatch "${FILESDIR}"/${PN}-CFLAGS.patch
+ epatch "${FILESDIR}"/${PN}-PLBASE.patch
epatch "${FILESDIR}"/${PN}-test.patch
if ! use minimal ; then
@@ -66,6 +67,7 @@ src_compile() {
cd "${S}"/src
econf \
+ --libdir=/usr/$(get_libdir) \
${threadconf} \
$(use_enable gmp) \
$(use_enable readline) \
@@ -85,6 +87,7 @@ src_compile() {
cd "${S}/packages"
econf \
+ --libdir=/usr/$(get_libdir) \
${threadconf} \
$(use_enable !static shared) \
--without-C-sicstus \
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.8.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.8.ebuild
index 5f922b8b4240..f8383c5a48d3 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.8.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.8.ebuild,v 1.6 2006/05/23 11:24:23 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.8.ebuild,v 1.7 2006/06/04 08:50:57 keri Exp $
inherit autotools eutils flag-o-matic
@@ -40,6 +40,7 @@ src_unpack() {
sed -i -e "s/man boot library/boot library/" src/Makefile.in
epatch "${FILESDIR}"/${PN}-CFLAGS.patch
+ epatch "${FILESDIR}"/${PN}-PLBASE.patch
epatch "${FILESDIR}"/${PN}-test.patch
if ! use minimal ; then
@@ -66,6 +67,7 @@ src_compile() {
cd "${S}"/src
econf \
+ --libdir=/usr/$(get_libdir) \
${threadconf} \
$(use_enable gmp) \
$(use_enable readline) \
@@ -85,6 +87,7 @@ src_compile() {
cd "${S}/packages"
econf \
+ --libdir=/usr/$(get_libdir) \
${threadconf} \
$(use_enable !static shared) \
--without-C-sicstus \
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.9.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.9.ebuild
index 5d14120c5af7..23957af798d4 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.9.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.9.ebuild,v 1.3 2006/05/23 11:24:23 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.9.ebuild,v 1.4 2006/06/04 08:50:57 keri Exp $
inherit autotools eutils flag-o-matic
@@ -40,6 +40,7 @@ src_unpack() {
sed -i -e "s/man boot library/boot library/" src/Makefile.in
epatch "${FILESDIR}"/${PN}-CFLAGS.patch
+ epatch "${FILESDIR}"/${PN}-PLBASE.patch
epatch "${FILESDIR}"/${PN}-test.patch
if ! use minimal ; then
@@ -66,6 +67,7 @@ src_compile() {
cd "${S}"/src
econf \
+ --libdir=/usr/$(get_libdir) \
${threadconf} \
$(use_enable gmp) \
$(use_enable readline) \
@@ -85,6 +87,7 @@ src_compile() {
cd "${S}/packages"
econf \
+ --libdir=/usr/$(get_libdir) \
${threadconf} \
$(use_enable !static shared) \
--without-C-sicstus \