summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2008-11-28 23:20:09 +0000
committerKeri Harris <keri@gentoo.org>2008-11-28 23:20:09 +0000
commit41341095cef0a0f4a84338b4409f60df1e727b7b (patch)
tree5aca50c49e65755775391525379fe18531cacbfa /dev-lang
parentamd64/x86 stable, bug #248760 (diff)
downloadgentoo-2-41341095cef0a0f4a84338b4409f60df1e727b7b.tar.gz
gentoo-2-41341095cef0a0f4a84338b4409f60df1e727b7b.tar.bz2
gentoo-2-41341095cef0a0f4a84338b4409f60df1e727b7b.zip
Allow JPL test-suite to run bootstrapped Prolog
(Portage version: 2.1.4.5)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/swi-prolog/ChangeLog5
-rw-r--r--dev-lang/swi-prolog/swi-prolog-5.6.62.ebuild16
2 files changed, 12 insertions, 9 deletions
diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog
index 22ec28311cf0..1b6ca2d22c4e 100644
--- a/dev-lang/swi-prolog/ChangeLog
+++ b/dev-lang/swi-prolog/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/swi-prolog
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.155 2008/10/28 06:51:59 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.156 2008/11/28 23:20:09 keri Exp $
+
+ 28 Nov 2008; <keri@gentoo.org> swi-prolog-5.6.62.ebuild:
+ Allow JPL test-suite to run bootstrapped Prolog
*swi-prolog-5.7.2 (28 Oct 2008)
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.62.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.62.ebuild
index 6a902f85d5a2..b13c5d84cebf 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.62.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.62.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2008 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.62.ebuild,v 1.1 2008/10/28 06:44:52 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.62.ebuild,v 1.2 2008/11/28 23:20:09 keri Exp $
inherit eutils flag-o-matic java-pkg-opt-2
-PATCHSET_VER="0"
+PATCHSET_VER="1"
DESCRIPTION="free, small, and standard compliant Prolog compiler"
HOMEPAGE="http://www.swi-prolog.org/"
@@ -54,15 +54,9 @@ src_compile() {
use hardened && append-flags -fno-unit-at-a-time
use debug && append-flags -DO_DEBUG
- local jpltestconf
- if use java && use test ; then
- jpltestconf="--with-junit=$(java-config --classpath junit)"
- fi
-
cd "${S}"/src
econf \
--libdir=/usr/$(get_libdir) \
- ${jpltestconf} \
$(use_enable gmp) \
$(use_enable readline) \
$(use_enable !static shared) \
@@ -73,6 +67,11 @@ src_compile() {
if ! use minimal ; then
einfo "Building SWI-Prolog additional packages"
+ local jpltestconf
+ if use java && use test ; then
+ jpltestconf="--with-junit=$(java-config --classpath junit)"
+ fi
+
cd "${S}/packages"
econf \
--libdir=/usr/$(get_libdir) \
@@ -87,6 +86,7 @@ src_compile() {
--with-http \
--without-jasmine \
$(use_with java jpl) \
+ ${jpltestconf} \
--with-nlp \
$(use_with odbc) \
--with-pldoc \