diff options
| author |   Keri Harris <keri@gentoo.org> | 2010-10-10 04:54:08 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2010-10-10 04:54:08 +0000 |
| commit | 79f4af47efbaa61db1b3c6ec2c1be254f00686da (patch) | |
| tree | 1e685aff3f85ffd9a63865d08d3a7bd66c689de1 /dev-lang/mercury | |
| parent | Fix by Christophe LEFEBVRE for doc install #314661 by Diego E. Pettenò. Cle... (diff) | |
| download | historical-79f4af47efbaa61db1b3c6ec2c1be254f00686da.tar.gz historical-79f4af47efbaa61db1b3c6ec2c1be254f00686da.tar.bz2 historical-79f4af47efbaa61db1b3c6ec2c1be254f00686da.zip | |
Fix multilib support for mercury runtime
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'dev-lang/mercury')
| -rw-r--r-- | dev-lang/mercury/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/mercury/Manifest | 4 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-10.04.1-linker-flags.patch | 14 |
3 files changed, 6 insertions, 17 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog index 108417933947..ee3a40c65220 100644 --- a/dev-lang/mercury/ChangeLog +++ b/dev-lang/mercury/ChangeLog @@ -1,6 +1,9 @@ # 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.117 2010/10/10 00:09:47 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.118 2010/10/10 04:54:08 keri Exp $ + + 10 Oct 2010; <keri@gentoo.org> files/mercury-10.04.1-linker-flags.patch: + Fix multilib support for mercury runtime 09 Oct 2010; <keri@gentoo.org> mercury-10.04.1.ebuild, +files/mercury-10.04.1-bootstrap-depend.patch, diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest index a7c8523129ed..d6dda139f081 100644 --- a/dev-lang/mercury/Manifest +++ b/dev-lang/mercury/Manifest @@ -25,7 +25,7 @@ AUX mercury-10.04.1-bootstrap-depend.patch 1605 RMD160 ae6c62b0cf7d23254fcc486f5 AUX mercury-10.04.1-char-det-from-int.patch 507 RMD160 b620007cd4c161ac51ba3417b0ff8fe1427670ec SHA1 92bfab764bb57fad2a5e5087dea2a28586986e55 SHA256 125794808c1b222bd97c43f205dbe678c0dc0edc0204f6a6df304f80a037c2b2 AUX mercury-10.04.1-default-grade.patch 9273 RMD160 d66b819f9a21e07de7cccda39c64c87c5cb2f1da SHA1 459b5340fd57035843a85b883432c2a96ca6b5f4 SHA256 41b5329f001812584eba7b9a70553cc09bfaff9c66baff2a64305625111942ee AUX mercury-10.04.1-docs.patch 890 RMD160 03cbff1254b61261cbca8fa2d518f02c3544bf42 SHA1 327891efea1c84d68326564e435ea093b91fc262 SHA256 492b3a92e93359330648f51f8b82d9d8b7addb22ba56bd7bfc8489aaedbc1764 -AUX mercury-10.04.1-linker-flags.patch 3661 RMD160 ad568f11077e30a4dadfd96a31b32bdf832c00e0 SHA1 235e88def696d2588a0ea7ede2df15cfafc276dd SHA256 3a4d1cceffcb5e659a0e7910a1d538099bd1c6aded524d67c8d4854c4f359d2f +AUX mercury-10.04.1-linker-flags.patch 3044 RMD160 fc729659474a93a9528386b22970470c622dadd3 SHA1 17d7bc190257d85f4cfc1fda2f430897ca0b07bd SHA256 2e798b89a7335526af0cb3e998372aaad2374ec8f225912fa45034c26ba59469 AUX mercury-10.04.1-multilib.patch 11698 RMD160 cc84d5b4cb35ccbb143903ad74991ccda760774b SHA1 8b476a0822570ad663dd8b29f6da37d9dd0c8272 SHA256 f247d7f8b312e1dca80b203bd7fd7e56ec79669b4de89eb4efc662dc8a50d4d3 AUX mercury-10.04.1-no-reconf.patch 2058 RMD160 b94029c812ad662f8ec95eabebfc30451b2d0fb0 SHA1 c273f5ffa5b89dd52b04f60a7c3e61b6ca5e3c1e SHA256 f2edfaa6f7944357e9aebe0e916b6c7b8db604a419af0be8a989d74f30a19c85 AUX mercury-10.04.1-sparc-llds-base-grade.patch 475 RMD160 0595dec723fb51333e489ab26aec5692a7761a4e SHA1 e5b0d5650d5b1641c7a989fff479c660c7761b51 SHA256 abad03efd5f4b4030cbf1888ca536abd1f01813886d79d0a69d34f640924479b @@ -54,5 +54,5 @@ EBUILD mercury-10.04-r1.ebuild 4397 RMD160 ac0c5f73a0468ad0b975c7b4e45fd962cd3d1 EBUILD mercury-10.04.1.ebuild 4915 RMD160 cac82413b0a1aa53998a83e07b94f1223f2a9ba1 SHA1 6754bbe32a7c4640d3aaf9df80dc30c59ba5d1eb SHA256 4cdaf57b11824775f6095cc0df92bf8b563acddf64a6e8d27b0c92155046f8f6 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 23962 RMD160 663b7ecdd06ad35441679aba54c40093e37fcb63 SHA1 352de32a56aa0661ee01a252e1826c17332f7599 SHA256 1ee20dc95be1cc93f915e444b6f24b53bfc8c218c93f744c288b94361dc2cece +MISC ChangeLog 24081 RMD160 fa09f4312a5fd84e33c2ca0ad7e418347f7ce910 SHA1 b12fcd63d7174e5000b254b65fd145e266af0e80 SHA256 c959c3d0a4fb49e7d529ce21701da5d73509535afdd4cad191c6bb4f3b650f7e MISC metadata.xml 318 RMD160 b9e62c5b9d04f43a6570cfcadd6a6c9a2b9e3f6f SHA1 67893d667419e727696eb2c386565794fd137418 SHA256 5e64767eb2ff6b10d88b169c87648d62b534356fb94c5407a253aeafc2d16935 diff --git a/dev-lang/mercury/files/mercury-10.04.1-linker-flags.patch b/dev-lang/mercury/files/mercury-10.04.1-linker-flags.patch index 7a08ebcb7b37..f053eb2930d2 100644 --- a/dev-lang/mercury/files/mercury-10.04.1-linker-flags.patch +++ b/dev-lang/mercury/files/mercury-10.04.1-linker-flags.patch @@ -10,20 +10,6 @@ diff -ur mercury-compiler-10.04.1.orig/boehm_gc/Makefile.direct mercury-compiler # Darwin shared library version of the gc. lib$(GC_GRADE).dylib: $(OBJS) $(UTILS) -diff -ur mercury-compiler-10.04.1.orig/library/Mmakefile mercury-compiler-10.04.1/library/Mmakefile ---- mercury-compiler-10.04.1.orig/library/Mmakefile 2010-09-05 11:44:16.000000000 +1200 -+++ mercury-compiler-10.04.1/library/Mmakefile 2010-05-20 21:29:30.000000000 +1200 -@@ -268,8 +268,8 @@ - [ -d jmercury/runtime ] || cp -r ../java/runtime jmercury - - install_mer_rt: $(RT_LIB_NAME).jar -- mkdir -p $(INSTALL_LIBDIR)/lib/$(GRADE) -- cp $(RT_LIB_NAME).jar $(INSTALL_LIBDIR)/lib/$(GRADE) -+ mkdir -p $(INSTALL_PREFIX)/lib/mercury/lib/$(GRADE) -+ cp $(RT_LIB_NAME).jar $(INSTALL_PREFIX)/lib/mercury/lib/$(GRADE) - - else - diff -ur mercury-compiler-10.04.1.orig/runtime/Mmakefile mercury-compiler-10.04.1/runtime/Mmakefile --- mercury-compiler-10.04.1.orig/runtime/Mmakefile 2010-07-16 03:24:52.000000000 +1200 +++ mercury-compiler-10.04.1/runtime/Mmakefile 2010-09-05 17:42:33.000000000 +1200 |