diff options
| author |   Keri Harris <keri@gentoo.org> | 2010-09-05 01:56:03 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2010-09-05 01:56:03 +0000 |
| commit | 0976fbf8c616f9a9193faba1161f28e680e97984 (patch) | |
| tree | de02fef6fc917af690c04ad993331d27acf4c8f7 /dev-lang | |
| parent | Rev bump to force rebuild after fixing an existing patch. (diff) | |
| download | historical-0976fbf8c616f9a9193faba1161f28e680e97984.tar.gz historical-0976fbf8c616f9a9193faba1161f28e680e97984.tar.bz2 historical-0976fbf8c616f9a9193faba1161f28e680e97984.zip | |
Install runtime jars into mercury libdir
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'dev-lang')
| -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-multilib.patch | 14 |
3 files changed, 20 insertions, 3 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog index 11608c467550..bbe1ccf0d2a9 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.113 2010/08/22 06:09:57 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.114 2010/09/05 01:56:03 keri Exp $ + + 05 Sep 2010; <keri@gentoo.org> files/mercury-10.04-multilib.patch: + Install runtime jars into mercury libdir *mercury-10.04-r1 (22 Aug 2010) diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest index 826a4e922c12..59a8a004950f 100644 --- a/dev-lang/mercury/Manifest +++ b/dev-lang/mercury/Manifest @@ -13,7 +13,7 @@ AUX mercury-10.04-boehm_gc.patch 5908 RMD160 08ce24e7df84974b9c77ead866a3b10738b AUX mercury-10.04-default-grade.patch 9201 RMD160 e4a68ccedf91d6fa366a819b54270c13cf44bca2 SHA1 12f510d62530506c2df6d21cfb36b4840fbb7621 SHA256 678a6ce56acd14ea40e834bee6165022600582b1a965682107a99389c5d071c7 AUX mercury-10.04-docs.patch 1071 RMD160 7227e1c079b269f332081b956e53b85358d72a70 SHA1 f27b48ecb5ba991261f93c2c8d640b7fd213830b SHA256 a4514f76a7174d16f392e3f9aa55d19a468f114541cf93129908feeaec462c06 AUX mercury-10.04-linker-flags.patch 3012 RMD160 355d9a021917326ea6b6df76277c62486cab9510 SHA1 0bc4a826c41af938cd422c50bb6bdc9d22f973c3 SHA256 9ca221ec91ff144a3871278bfde86ece642cc27446f6dca418496222564fa5a1 -AUX mercury-10.04-multilib.patch 5993 RMD160 70cf37287f8a352eb09f66c402ea0e6690dd26be SHA1 1f0b47f3bfab7ffe54c487bde1c84e0499bca2f0 SHA256 43497f32f110e064bedae7b2aeaef63fc6b394276d7aa7e46864c97781de4db3 +AUX mercury-10.04-multilib.patch 6602 RMD160 e1bbc09b05d6861885ff910ca6636c3f700933a8 SHA1 c2b786ac16f55b74ea6332ce6afcdc1c4f8aa005 SHA256 5b5e94ef4ba12aad2b3a41ff1a5114612ee774c84efdaf543590444a693384e9 AUX mercury-10.04-no-reconf.patch 2337 RMD160 f39b7e0c777eba144d103078d3e81fb0a4ea21c7 SHA1 a4166eaf922e6423ff8761f486691f5b75fc14f9 SHA256 3b4dc9724fe9baed3222e43d86d3af73692d0f3f7285f6b6dbd4df0407690921 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 @@ -39,5 +39,5 @@ EBUILD mercury-0.13.1-r2.ebuild 3350 RMD160 8a1635d8c301751b2da7260785baaa788b81 EBUILD mercury-10.04-r1.ebuild 4397 RMD160 ac0c5f73a0468ad0b975c7b4e45fd962cd3d1b42 SHA1 b7d1d4b635f916f1be1a4fc496c2d80f9949ab30 SHA256 55dfdb3ae95f0dfc74014d2f87085d568316c84d78d74805e30c8674f8ece543 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 22810 RMD160 c7e64f165330e4522d5fbc15e7638e2bbe3fe937 SHA1 09b4c8549bebf7ad6e3acb34aedd63c85cffd286 SHA256 6a49e00c926484061dfe8ff5eafeab87bb5fd3851b632864d1f4779343f898f8 +MISC ChangeLog 22923 RMD160 32f928810001d680f38c84d38856182fafb23519 SHA1 e2941eb5f1034f1ff8c548032358e6f1764a1483 SHA256 885ecfd1e94eaf980398e6b7c4128bc47e39784edcd3890555645b0de4070770 MISC metadata.xml 318 RMD160 b9e62c5b9d04f43a6570cfcadd6a6c9a2b9e3f6f SHA1 67893d667419e727696eb2c386565794fd137418 SHA256 5e64767eb2ff6b10d88b169c87648d62b534356fb94c5407a253aeafc2d16935 diff --git a/dev-lang/mercury/files/mercury-10.04-multilib.patch b/dev-lang/mercury/files/mercury-10.04-multilib.patch index 649b4e816414..0c66afb64b5b 100644 --- a/dev-lang/mercury/files/mercury-10.04-multilib.patch +++ b/dev-lang/mercury/files/mercury-10.04-multilib.patch @@ -82,6 +82,20 @@ diff -ur mercury-compiler-10.04.orig/compiler/make.program_target.c mercury-comp MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0, make__program_target__install_grade_ints_and_headers_9_0_i6); MR_def_label(make__program_target__install_grade_ints_and_headers_9_0,6) +diff -ur mercury-compiler-10.04.orig/library/Mmakefile mercury-compiler-10.04/library/Mmakefile +--- mercury-compiler-10.04.orig/library/Mmakefile 2010-05-20 21:29:30.000000000 +1200 ++++ mercury-compiler-10.04/library/Mmakefile 2010-09-05 11:49: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_PREFIX)/lib/mercury/lib/$(GRADE) +- cp $(RT_LIB_NAME).jar $(INSTALL_PREFIX)/lib/mercury/lib/$(GRADE) ++ mkdir -p $(INSTALL_LIBDIR)/lib/$(GRADE) ++ cp $(RT_LIB_NAME).jar $(INSTALL_LIBDIR)/lib/$(GRADE) + + else + diff -ur mercury-compiler-10.04.orig/scripts/Mmake.vars.in mercury-compiler-10.04/scripts/Mmake.vars.in --- mercury-compiler-10.04.orig/scripts/Mmake.vars.in 2010-05-20 21:29:31.000000000 +1200 +++ mercury-compiler-10.04/scripts/Mmake.vars.in 2010-07-19 21:00:29.000000000 +1200 |