Archives
Archives
| From: | "Keri Harris (keri)" <keri@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in dev-lang/mercury/files: mercury-10.04_beta1-ppc-lexer.patch |
| Date: | Sun, 25 Apr 2010 08:25:50 |
| Message-Id: | 20100425082546.27BE02C04C@corvid.gentoo.org |
| 1 | keri 10/04/25 08:25:46 |
| 2 | |
| 3 | Modified: mercury-10.04_beta1-ppc-lexer.patch |
| 4 | Log: |
| 5 | Move MGNUCFLAGS-lexer definition to library/Mmakefile to allow mmc to parse Mercury.options. Closes #317051 |
| 6 | (Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.2 dev-lang/mercury/files/mercury-10.04_beta1-ppc-lexer.patch |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mercury/files/mercury-10.04_beta1-ppc-lexer.patch?rev=1.2&view=markup |
| 12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mercury/files/mercury-10.04_beta1-ppc-lexer.patch?rev=1.2&content-type=text/plain |
| 13 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mercury/files/mercury-10.04_beta1-ppc-lexer.patch?r1=1.1&r2=1.2 |
| 14 | |
| 15 | Index: mercury-10.04_beta1-ppc-lexer.patch |
| 16 | =================================================================== |
| 17 | RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/files/mercury-10.04_beta1-ppc-lexer.patch,v |
| 18 | retrieving revision 1.1 |
| 19 | retrieving revision 1.2 |
| 20 | diff -u -r1.1 -r1.2 |
| 21 | --- mercury-10.04_beta1-ppc-lexer.patch 11 Apr 2010 00:21:18 -0000 1.1 |
| 22 | +++ mercury-10.04_beta1-ppc-lexer.patch 25 Apr 2010 08:25:45 -0000 1.2 |
| 23 | @@ -1,10 +1,12 @@ |
| 24 | ---- mercury-compiler-10.04-beta.orig/library/Mercury.options 2009-06-12 17:00:26.000000000 +1200 |
| 25 | -+++ mercury-compiler-10.04-beta/library/Mercury.options 2010-04-11 12:14:32.000000000 +1200 |
| 26 | -@@ -89,3 +89,7 @@ |
| 27 | - |
| 28 | - # Work around a problem in the HiPE compiler (as of Erlang R11B5). |
| 29 | - MCFLAGS-bitmap += --no-erlang-native-code |
| 30 | -+ |
| 31 | +--- mercury-compiler-10.04-beta.orig/library/Mmakefile 2009-11-05 14:59:45.000000000 +1300 |
| 32 | ++++ mercury-compiler-10.04-beta/library/Mmakefile 2010-04-25 19:27:49.000000000 +1200 |
| 33 | +@@ -37,6 +37,9 @@ |
| 34 | + # Module-specific options should go in Mercury.options so they |
| 35 | + # can be found by `mmc --make'. |
| 36 | + include Mercury.options |
| 37 | +ifeq ("$(ARCH)","ppc") |
| 38 | +MGNUCFLAGS-lexer += -O0 |
| 39 | +endif |
| 40 | + |
| 41 | + MERCURY_MAIN_MODULES = mer_std |
| 42 | + |