Move MGNUCFLAGS-lexer definition to library/Mmakefile to allow mmc to parse Mercury...

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 2fe80714a74aa0020fa9ef90c23788e6f4138fce..d0f26fe25d3fda9d8e626a0dd99536b7146c24b4 100644 (file)
--- 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/Manifest b/dev-lang/mercury/Manifest
index 75c71fba8628d2044ff69ca93478ff605c38e60d..04fa07ccf980fb27fdf9eed545a5983f96546fd3 100644 (file)
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -13,7 +13,7 @@ AUX mercury-10.04_beta1-boehm_gc.patch 4231 RMD160 a8f7f12d5768156de83d90362e810
 AUX mercury-10.04_beta1-docs.patch 804 RMD160 8b04f68882da22485d6db8c1a0184d37870dc2b5 SHA1 efdb8948178b9287664bd8ad6e8896b10affb213 SHA256 55bafac83acd9da404da9b626ab7a6e137a13f1169c9612caa6908f2f7152096
 AUX mercury-10.04_beta1-multilib.patch 6335 RMD160 f85d640f33316f7bfbf53145a37c36d758c1c369 SHA1 dc2b4e0a9471b138a5962f49c81ba964fbaef200 SHA256 5c6b819642948a8d6816af476a140cb0d0405823bbacb525cf4cdf141661d08a
 AUX mercury-10.04_beta1-no-reconf.patch 2082 RMD160 39582f6936066ab76198d6c70d8ef560794ba0e1 SHA1 560210b6d47a0eb15989a0df5489788621384cc4 SHA256 7b4f29b7860275dfe6170428e49b395ecc34c3e19c675f920c60b84e203d461e
-AUX mercury-10.04_beta1-ppc-lexer.patch 378 RMD160 97b813000049448b7ac17a5a28ba8989b231633e SHA1 a0834050fd71b83d358bc0a8831a3305536824f4 SHA256 ef3af65d1fa64e979520f2182ac8e4dc8cb1c90693dae1a4356df8e90b261c3d
+AUX mercury-10.04_beta1-ppc-lexer.patch 409 RMD160 47ced82c05928303b9480159482cca764314f505 SHA1 d574da362d0d08d4e7dd69a1fcbb6429ec6feb6e SHA256 112f8e7ed38c4c02c1725bdac0702fecd1d384e4f4b457e09164645fab288c47
 AUX mercury-10.04_beta1-tests-sandbox.patch 2380 RMD160 b2217ad08a724f5daebbd48fd6a78b4ff4a82d10 SHA1 618f80f87e1bc8685db83ccb9c21dd82414c5a7c SHA256 1622550fc01ebe16cdc197363e006f7bb588110168fdf68ae3cb1b153b4ead8a
 AUX mercury-10.04_beta1-tests-subdir.patch 504 RMD160 25273c94dd44ed9c461e6cc7dd1769b9b6c43251 SHA1 5ced3f073003269e1542df8f5a723ee65be05767 SHA256 435590b3e3002bb1141b8be3ee5363f9b408c31288b9aee7186b7334c6c495cf
 AUX mercury-10.04_beta1-tests-workspace.patch 1093 RMD160 8fb5883e52f2810594172643bbf4af4002396429 SHA1 cd4eaac0580644bc9787277eb63975e5cd85535a SHA256 9091d6dd37ca299163b37a560ae19477d827281d41836b9306c0a5caf7b6b36f
@@ -23,5 +23,5 @@ DIST mercury-tests-0.13.1.tar.gz 986644 RMD160 779609ba5c985e562b0962434c9281c07
 DIST mercury-tests-10.04-beta.tar.gz 5876463 RMD160 b29179ae78b1dcb0619684228abac0d6cd4471a8 SHA1 3fed8b5fbe840e844df725f386a08836825d48da SHA256 4c1bf8eece8f95fdf13eeaef8dc5ea4fee30646d20fed684fe6eb710d5234833
 EBUILD mercury-0.13.1-r2.ebuild 3350 RMD160 8a1635d8c301751b2da7260785baaa788b81b620 SHA1 2aae241faf85518b6bb6d162939b2f293eb67649 SHA256 af0a034331b9a7acb0d0a7dea42fc84aafcf9e66de2b6fceddc623f975689c44
 EBUILD mercury-10.04_beta1.ebuild 3561 RMD160 b608b732acdfccb4a8ccdc4728bdd0b9f3f28283 SHA1 319302199665f6e4ffa9aaff95128fcd8a7d63a0 SHA256 ffbba59515166327f79a698086d516f14fcbcfc8c76f58dbf1116eaa8eb16626
-MISC ChangeLog 20706 RMD160 0bda2c7bd4eedacbb817a1f1aed7ca358531f767 SHA1 26f83543b762f59345d6269f6db04f61af0a83a3 SHA256 1b8b024701cfdc1fd43988acc39b6b6b2386799d735b5dc09e3b418358477098
+MISC ChangeLog 20895 RMD160 f39c85ec897643f058a60c9cb8ce419205e06477 SHA1 be13bd53514ecad4d97d642466c261516ee33438 SHA256 5939450aa940e9a3b07cbe3c1e8ef4774b765a4efdd6c6f9e012eac7ff80194a
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa

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 545278973610016d144005aff9bedcbabc01cb55..15609787af1059aed1c9a7d3d305d17469e9466c 100644 (file)
--- 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
+