Archives
Archives
| From: | "Keri Harris (keri)" <keri@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in dev-lang/mercury/files: mercury-10.04.1-linker-flags.patch |
| Date: | Sun, 10 Oct 2010 05:03:24 |
| Message-Id: | 20101010045408.B640520051@flycatcher.gentoo.org |
| 1 | keri 10/10/10 04:54:08 |
| 2 | |
| 3 | Modified: mercury-10.04.1-linker-flags.patch |
| 4 | Log: |
| 5 | Fix multilib support for mercury runtime |
| 6 | (Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.2 dev-lang/mercury/files/mercury-10.04.1-linker-flags.patch |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-linker-flags.patch?rev=1.2&view=markup |
| 12 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-linker-flags.patch?rev=1.2&content-type=text/plain |
| 13 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-linker-flags.patch?r1=1.1&r2=1.2 |
| 14 | |
| 15 | Index: mercury-10.04.1-linker-flags.patch |
| 16 | =================================================================== |
| 17 | RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/files/mercury-10.04.1-linker-flags.patch,v |
| 18 | retrieving revision 1.1 |
| 19 | retrieving revision 1.2 |
| 20 | diff -u -r1.1 -r1.2 |
| 21 | --- mercury-10.04.1-linker-flags.patch 5 Sep 2010 05:48:08 -0000 1.1 |
| 22 | +++ mercury-10.04.1-linker-flags.patch 10 Oct 2010 04:54:08 -0000 1.2 |
| 23 | @@ -10,20 +10,6 @@ |
| 24 | |
| 25 | # Darwin shared library version of the gc. |
| 26 | lib$(GC_GRADE).dylib: $(OBJS) $(UTILS) |
| 27 | -diff -ur mercury-compiler-10.04.1.orig/library/Mmakefile mercury-compiler-10.04.1/library/Mmakefile |
| 28 | ---- mercury-compiler-10.04.1.orig/library/Mmakefile 2010-09-05 11:44:16.000000000 +1200 |
| 29 | -+++ mercury-compiler-10.04.1/library/Mmakefile 2010-05-20 21:29:30.000000000 +1200 |
| 30 | -@@ -268,8 +268,8 @@ |
| 31 | - [ -d jmercury/runtime ] || cp -r ../java/runtime jmercury |
| 32 | - |
| 33 | - install_mer_rt: $(RT_LIB_NAME).jar |
| 34 | -- mkdir -p $(INSTALL_LIBDIR)/lib/$(GRADE) |
| 35 | -- cp $(RT_LIB_NAME).jar $(INSTALL_LIBDIR)/lib/$(GRADE) |
| 36 | -+ mkdir -p $(INSTALL_PREFIX)/lib/mercury/lib/$(GRADE) |
| 37 | -+ cp $(RT_LIB_NAME).jar $(INSTALL_PREFIX)/lib/mercury/lib/$(GRADE) |
| 38 | - |
| 39 | - else |
| 40 | - |
| 41 | diff -ur mercury-compiler-10.04.1.orig/runtime/Mmakefile mercury-compiler-10.04.1/runtime/Mmakefile |
| 42 | --- mercury-compiler-10.04.1.orig/runtime/Mmakefile 2010-07-16 03:24:52.000000000 +1200 |
| 43 | +++ mercury-compiler-10.04.1/runtime/Mmakefile 2010-09-05 17:42:33.000000000 +1200 |