diff options
| author |   Keri Harris <keri@gentoo.org> | 2010-04-25 08:25:46 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2010-04-25 08:25:46 +0000 |
| commit | 9f97cc132ba080e1036605758de2ce6aa1b9318c (patch) | |
| tree | 4a6f55b331466df041e93427620b026ae9d7ea96 /dev-lang | |
| parent | Bump to version for testing purposes, bug 316583 thank lamusic for report and... (diff) | |
| download | gentoo-2-9f97cc132ba080e1036605758de2ce6aa1b9318c.tar.gz gentoo-2-9f97cc132ba080e1036605758de2ce6aa1b9318c.tar.bz2 gentoo-2-9f97cc132ba080e1036605758de2ce6aa1b9318c.zip | |
Move MGNUCFLAGS-lexer definition to library/Mmakefile to allow mmc to parse Mercury.options. Closes #317051
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/mercury/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-10.04_beta1-ppc-lexer.patch | 16 |
2 files changed, 14 insertions, 8 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog index 2fe80714a74a..d0f26fe25d3f 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.102 2010/04/11 00:21:18 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.103 2010/04/25 08:25:46 keri Exp $ + + 25 Apr 2010; <keri@gentoo.org> files/mercury-10.04_beta1-ppc-lexer.patch: + Move MGNUCFLAGS-lexer definition to library/Mmakefile to allow mmc to + parse Mercury.options. Closes #317051 11 Apr 2010; <keri@gentoo.org> mercury-10.04_beta1.ebuild, +files/mercury-10.04_beta1-ppc-lexer.patch: diff --git a/dev-lang/mercury/files/mercury-10.04_beta1-ppc-lexer.patch b/dev-lang/mercury/files/mercury-10.04_beta1-ppc-lexer.patch index 545278973610..15609787af10 100644 --- a/dev-lang/mercury/files/mercury-10.04_beta1-ppc-lexer.patch +++ b/dev-lang/mercury/files/mercury-10.04_beta1-ppc-lexer.patch @@ -1,10 +1,12 @@ ---- mercury-compiler-10.04-beta.orig/library/Mercury.options 2009-06-12 17:00:26.000000000 +1200 -+++ mercury-compiler-10.04-beta/library/Mercury.options 2010-04-11 12:14:32.000000000 +1200 -@@ -89,3 +89,7 @@ - - # Work around a problem in the HiPE compiler (as of Erlang R11B5). - MCFLAGS-bitmap += --no-erlang-native-code -+ +--- mercury-compiler-10.04-beta.orig/library/Mmakefile 2009-11-05 14:59:45.000000000 +1300 ++++ mercury-compiler-10.04-beta/library/Mmakefile 2010-04-25 19:27:49.000000000 +1200 +@@ -37,6 +37,9 @@ + # Module-specific options should go in Mercury.options so they + # can be found by `mmc --make'. + include Mercury.options +ifeq ("$(ARCH)","ppc") +MGNUCFLAGS-lexer += -O0 +endif + + MERCURY_MAIN_MODULES = mer_std + |