diff options
| author |   Keri Harris <keri@gentoo.org> | 2010-07-28 08:24:55 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2010-07-28 08:24:55 +0000 |
| commit | 43d73fabf9b9a9818883da4d844d49253d4cb361 (patch) | |
| tree | 077b1a12da290a0795b09344125c8917f42d75c8 /dev-lang/mercury | |
| parent | Version bump, closes bug 330125 by Jens Pranaitis. Ebuild now uses the ruby-n... (diff) | |
| download | gentoo-2-43d73fabf9b9a9818883da4d844d49253d4cb361.tar.gz gentoo-2-43d73fabf9b9a9818883da4d844d49253d4cb361.tar.bz2 gentoo-2-43d73fabf9b9a9818883da4d844d49253d4cb361.zip | |
Disable hard-coded static link tests
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/mercury')
| -rw-r--r-- | dev-lang/mercury/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-10.04-tests-static-link.patch | 11 | ||||
| -rw-r--r-- | dev-lang/mercury/mercury-10.04.ebuild | 3 |
3 files changed, 18 insertions, 2 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog index d0c372602543..3be7e9a0b2be 100644 --- a/dev-lang/mercury/ChangeLog +++ b/dev-lang/mercury/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/mercury # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.111 2010/07/26 07:30:19 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.112 2010/07/28 08:24:55 keri Exp $ + + 28 Jul 2010; <keri@gentoo.org> mercury-10.04.ebuild, + +files/mercury-10.04-tests-static-link.patch: + Disable hard-coded static link tests 26 Jul 2010; <keri@gentoo.org> mercury-10.04.ebuild, +files/mercury-10.04-sparc-llds-base-grade.patch: diff --git a/dev-lang/mercury/files/mercury-10.04-tests-static-link.patch b/dev-lang/mercury/files/mercury-10.04-tests-static-link.patch new file mode 100644 index 000000000000..149fa3b5c9e5 --- /dev/null +++ b/dev-lang/mercury/files/mercury-10.04-tests-static-link.patch @@ -0,0 +1,11 @@ +--- mercury-tests-10.04.orig/hard_coded/Mmakefile 2010-05-03 22:27:02.000000000 +1200 ++++ mercury-tests-10.04/hard_coded/Mmakefile 2010-07-28 20:17:50.000000000 +1200 +@@ -677,7 +677,7 @@ + PROGS = $(ORDINARY_PROGS) $(PROF_PROGS) $(BROKEN_FOR_LCC_PROGS) \ + $(CLOSURE_LAYOUT_PROGS) $(NON_PROFDEEP_PROGS) \ + $(BACKEND_PROGS) $(NONDET_C_PROGS) \ +- $(C_AND_GC_ONLY_PROGS) $(STATIC_LINK_PROGS) \ ++ $(C_AND_GC_ONLY_PROGS) \ + $(CHAR_REP_PROGS) $(C_ONLY_PROGS) \ + $(DOTNET_PROGS) $(JAVA_PROGS) $(SOLVER_PROGS) \ + $(TRAILED_PROGS) $(MUTABLE_PROGS) $(TRACE_GOAL_ENV_PROGS) \ diff --git a/dev-lang/mercury/mercury-10.04.ebuild b/dev-lang/mercury/mercury-10.04.ebuild index a88ac40cc5eb..76cad9f26f9a 100644 --- a/dev-lang/mercury/mercury-10.04.ebuild +++ b/dev-lang/mercury/mercury-10.04.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild,v 1.5 2010/07/26 07:30:20 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild,v 1.6 2010/07/28 08:24:55 keri Exp $ inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib @@ -49,6 +49,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-tests-workspace.patch epatch "${FILESDIR}"/${P}-tests-sandbox.patch epatch "${FILESDIR}"/${P}-tests-mercury-float.patch + epatch "${FILESDIR}"/${P}-tests-static-link.patch fi } |