diff options
| author |   Keri Harris <keri@gentoo.org> | 2007-01-11 08:54:43 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2007-01-11 08:54:43 +0000 |
| commit | 6a0b83964ffc6b327550fc377832aa8797c7c6d2 (patch) | |
| tree | c5a9209f0e80ad2fb00267cb26edf807544d2044 /dev-lang/mercury | |
| parent | Bad keywords - need to file a bug or two on this (diff) | |
| download | gentoo-2-6a0b83964ffc6b327550fc377832aa8797c7c6d2.tar.gz gentoo-2-6a0b83964ffc6b327550fc377832aa8797c7c6d2.tar.bz2 gentoo-2-6a0b83964ffc6b327550fc377832aa8797c7c6d2.zip | |
Handle workspace flags when running against the Mercury test-suite.
(Portage version: 2.1.2_rc4-r2)
Diffstat (limited to 'dev-lang/mercury')
| -rw-r--r-- | dev-lang/mercury/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.13.1-tests-workspace.patch | 13 | ||||
| -rw-r--r-- | dev-lang/mercury/mercury-0.13.1-r1.ebuild | 12 |
3 files changed, 29 insertions, 2 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog index fbce247c56b8..730845804150 100644 --- a/dev-lang/mercury/ChangeLog +++ b/dev-lang/mercury/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/mercury # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.73 2007/01/09 08:59:54 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.74 2007/01/11 08:54:43 keri Exp $ + + 11 Jan 2007; keri <keri@gentoo.org> + +files/mercury-0.13.1-tests-workspace.patch, mercury-0.13.1-r1.ebuild: + Handle workspace flags when running against the Mercury test-suite. 09 Jan 2007; keri <keri@gentoo.org> mercury-0.13.1-r1.ebuild: Add ~amd64 to KEYWORDS. diff --git a/dev-lang/mercury/files/mercury-0.13.1-tests-workspace.patch b/dev-lang/mercury/files/mercury-0.13.1-tests-workspace.patch new file mode 100644 index 000000000000..7897d3f0ec7c --- /dev/null +++ b/dev-lang/mercury/files/mercury-0.13.1-tests-workspace.patch @@ -0,0 +1,13 @@ +--- mercury-tests-0.13.1.orig/Mmake.common 2006-01-25 20:03:44.000000000 +1300 ++++ mercury-tests-0.13.1/Mmake.common 2007-01-11 21:36:31.000000000 +1300 +@@ -73,8 +73,8 @@ + -include $(TESTS_DIR)/Mmake.params + + MCFLAGS += --flags $(TESTS_DIR)/TESTS_FLAGS +-ifdef WORKSPACE_FLAGS +-MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS ++ifdef WORKSPACE ++MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS.ws + endif + + # Avoid trying to make this file with `mmc --make' if it doesn't exist. diff --git a/dev-lang/mercury/mercury-0.13.1-r1.ebuild b/dev-lang/mercury/mercury-0.13.1-r1.ebuild index 30aed09a2026..8b1c0037fb72 100644 --- a/dev-lang/mercury/mercury-0.13.1-r1.ebuild +++ b/dev-lang/mercury/mercury-0.13.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.1-r1.ebuild,v 1.5 2007/01/09 08:59:54 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.1-r1.ebuild,v 1.6 2007/01/11 08:54:43 keri Exp $ inherit eutils @@ -39,6 +39,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-tests-mdbrc.patch epatch "${FILESDIR}"/${P}-tests-string_format.patch epatch "${FILESDIR}"/${P}-tests-tabling_inf_recursion.patch + epatch "${FILESDIR}"/${P}-tests-workspace.patch sed -i -e "s:MDB_DOC:${S}/doc/mdb_doc:" "${TESTDIR}"/mdbrc } @@ -99,12 +100,21 @@ src_test() { fi cd "${TESTDIR}" + sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws + PATH="${TWS}"/scripts:"${TWS}"/util:"${PATH}" \ WORKSPACE="${TWS}" \ MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \ MMAKE_DIR="${TWS}"/scripts \ MERCURY_DEBUGGER_INIT="${TESTDIR}"/mdbrc \ GRADE=${TEST_GRADE} \ + MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc \ + -I${TWS}/boehm_gc/include \ + -I${TWS}/runtime \ + -I${TWS}/library \ + -I${TWS}/mdbcomp \ + -I${TWS}/browser \ + -I${TWS}/trace" \ mmake || die "mmake test failed" } |