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 | fb74294929e6fc6bf64b013edba5bd4c04fa1e7b (patch) | |
| tree | fb598e4d30d782637ebf267cd58b6e353949b04b /dev-lang/mercury | |
| parent | Rev bump to force rebuild after fixing an existing patch. (diff) | |
| download | gentoo-2-fb74294929e6fc6bf64b013edba5bd4c04fa1e7b.tar.gz gentoo-2-fb74294929e6fc6bf64b013edba5bd4c04fa1e7b.tar.bz2 gentoo-2-fb74294929e6fc6bf64b013edba5bd4c04fa1e7b.zip | |
Install runtime jars into mercury libdir
(Portage version: 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/files/mercury-10.04-multilib.patch | 14 |
2 files changed, 18 insertions, 1 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/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 |