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 | 47bdabfc2b4611d3f20d8b14eb1e1667f1daec8a (patch) | |
| tree | 047ef00aeed6de6142695b85bceec120f3b8754c /dev-lang | |
| parent | Fix by Christophe LEFEBVRE for doc install #314661 by Diego E. Pettenò. Cle... (diff) | |
| download | gentoo-2-47bdabfc2b4611d3f20d8b14eb1e1667f1daec8a.tar.gz gentoo-2-47bdabfc2b4611d3f20d8b14eb1e1667f1daec8a.tar.bz2 gentoo-2-47bdabfc2b4611d3f20d8b14eb1e1667f1daec8a.zip | |
Fix multilib support for mercury runtime
(Portage version: 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/files/mercury-10.04.1-linker-flags.patch | 14 |
2 files changed, 4 insertions, 15 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/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 |