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 | 45eee558a6c5dbc10d52ecf7228106f2e1e4831e (patch) | |
| tree | 7b26b9ba47a5a30c2a8f262a5339202089934e7d /dev-lang/mercury | |
| parent | Version bump, closes bug 330125 by Jens Pranaitis. Ebuild now uses the ruby-n... (diff) | |
| download | historical-45eee558a6c5dbc10d52ecf7228106f2e1e4831e.tar.gz historical-45eee558a6c5dbc10d52ecf7228106f2e1e4831e.tar.bz2 historical-45eee558a6c5dbc10d52ecf7228106f2e1e4831e.zip | |
Disable hard-coded static link tests
Package-Manager: portage-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/Manifest | 5 | ||||
| -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 |
4 files changed, 21 insertions, 4 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/Manifest b/dev-lang/mercury/Manifest index a4802604b5c2..bdc80e7f7b5d 100644 --- a/dev-lang/mercury/Manifest +++ b/dev-lang/mercury/Manifest @@ -17,6 +17,7 @@ AUX mercury-10.04-no-reconf.patch 2337 RMD160 f39b7e0c777eba144d103078d3e81fb0a4 AUX mercury-10.04-sparc-llds-base-grade.patch 467 RMD160 de8ae191173d077806650db073aaefb7d89c50c1 SHA1 61aa9fd27cfd896ecfdc43e053cad4c923405226 SHA256 3b1080bdb5bac32ac2f83a6b6de0584aa4f68d9f3cfcd113396946598b61ab9f AUX mercury-10.04-tests-mercury-float.patch 2056 RMD160 0eeda80258e9e675be1866d42428618efa1cc2f9 SHA1 d69de5c6e94601e49c4e4d459996e0fa5fda996e SHA256 79f6b92ea2d37d3c0b8147497a110266278a193fcee825270c2217c1d44aa4a1 AUX mercury-10.04-tests-sandbox.patch 2932 RMD160 2cb2b82e4d282c31ecfd350e732f5ccf505debb9 SHA1 922226b4344ca2833da734d7ab271c756a440a62 SHA256 9e67a417ce59d0e0e9c698a3573902829222ad28462ff246809bd7c6318e15ed +AUX mercury-10.04-tests-static-link.patch 568 RMD160 72a38e289d1e7f76e4dfdae21c42322d452b8fcf SHA1 76b78ee37ac2b3ef4ddc804485d7bd10a9720dff SHA256 f37e8399aed753a947062d40573ba5205ef62ecfbbe87ecb8632cf1895002663 AUX mercury-10.04-tests-workspace.patch 1058 RMD160 34f0623fdf595bdd4c098cf57573178a622fc4e4 SHA1 e6afeec2e55d8b61dbf6359fb03289534059f86c SHA256 7551204ad0bd0fdbe6b17d29bd44d7ab4ae5a1f1b51d32391e368bbb747a3d1d AUX mercury-10.04_beta1-atomic-ops.patch 568 RMD160 e557798f12ac9325ed6b251c1bc7dc87d36e1225 SHA1 0ea7f1c346b69aa73d387b5bdee12e34e482b129 SHA256 90720443306685422a7c2bf9f3fa2193feef4eda71de38a474cc0303381ce5e1 AUX mercury-10.04_beta1-boehm_gc.patch 4231 RMD160 a8f7f12d5768156de83d90362e81094084f3fd35 SHA1 8a595992e162f48ccacb63fb6df497e361901f2c SHA256 45eafb8b94538336f0de13085359aa1b9998fd2c99d67c735b71f4e09b8e786e @@ -34,7 +35,7 @@ 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 DIST mercury-tests-10.04.tar.gz 1329423 RMD160 c85e489eea4e36fef6d12fb9bf4e7cd01bb2e7fd SHA1 32ca9267d58d2cbb7d144c1501803f0a7b92f145 SHA256 d56a76b4a2c8c2cc878b7a7cd04fd34b4069cef1316155a942f4372425d45085 EBUILD mercury-0.13.1-r2.ebuild 3350 RMD160 8a1635d8c301751b2da7260785baaa788b81b620 SHA1 2aae241faf85518b6bb6d162939b2f293eb67649 SHA256 af0a034331b9a7acb0d0a7dea42fc84aafcf9e66de2b6fceddc623f975689c44 -EBUILD mercury-10.04.ebuild 4098 RMD160 b4b747f1b998e1abcb3b59f6baad1c165b37ff8c SHA1 3ab355b9357e8dc38a2363f1a0169c3306db2fb6 SHA256 63952de9ef2c44fd9f4311c711239a7c8387eaa6a1b991f8b8d81b717fc6bef9 +EBUILD mercury-10.04.ebuild 4150 RMD160 565ad36c8253f0da62f6a4256cbf45d2655a6223 SHA1 3f6363b22b7b4dcd0fe731f404d6d8dadb6cebff SHA256 943ee918a3113d45d268f4091de5a0767d05e99194f121771ce43c3a9c71eba0 EBUILD mercury-10.04_beta1.ebuild 3561 RMD160 b608b732acdfccb4a8ccdc4728bdd0b9f3f28283 SHA1 319302199665f6e4ffa9aaff95128fcd8a7d63a0 SHA256 ffbba59515166327f79a698086d516f14fcbcfc8c76f58dbf1116eaa8eb16626 -MISC ChangeLog 22513 RMD160 0d00abba86a43d61d3447d6f0b83e472fd95b8e5 SHA1 82a55d65cc4af1f7e3626380319b3b8c3096530d SHA256 a3ea6695d1118d0e056e5cd8dd42549083df13fc6ced6f3816336e62e06dedd3 +MISC ChangeLog 22656 RMD160 0102f38f4f9695b4fd4468a0f6edd9290892fd62 SHA1 b8d2b8743d6220ff4c68d583613e250ca569224d SHA256 4a1634172b8a684b5d222965c620ee379f96dec6aa0547911b6140aabbdd5fb1 MISC metadata.xml 318 RMD160 b9e62c5b9d04f43a6570cfcadd6a6c9a2b9e3f6f SHA1 67893d667419e727696eb2c386565794fd137418 SHA256 5e64767eb2ff6b10d88b169c87648d62b534356fb94c5407a253aeafc2d16935 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 } |