diff options
| author |   Keri Harris <keri@gentoo.org> | 2006-09-16 20:12:06 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2006-09-16 20:12:06 +0000 |
| commit | c9695dc3a879ddc44dfa26daaa76c7d6e116f574 (patch) | |
| tree | 611b482185b19249c3669bd77090736f4eba9b52 | |
| parent | Mask latest libtorrent/rtorrent because of big memory leaks. (diff) | |
| download | gentoo-2-c9695dc3a879ddc44dfa26daaa76c7d6e116f574.tar.gz gentoo-2-c9695dc3a879ddc44dfa26daaa76c7d6e116f574.tar.bz2 gentoo-2-c9695dc3a879ddc44dfa26daaa76c7d6e116f574.zip | |
Run mmake depend in stage 2 bootstrap.
(Portage version: 2.1.1)
| -rw-r--r-- | dev-lang/mercury/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.12.2-MAKEOPTS.patch | 8 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.12.2-libgrades.patch | 13 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.13.0-MAKEOPTS.patch | 8 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.13.0-libgrades.patch | 13 |
5 files changed, 22 insertions, 27 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog index 049262f39c4e..1aacdf2abad0 100644 --- a/dev-lang/mercury/ChangeLog +++ b/dev-lang/mercury/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/mercury # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.42 2006/09/16 10:20:51 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.43 2006/09/16 20:12:06 keri Exp $ + + 16 Sep 2006; keri <keri@gentoo.org> files/mercury-0.12.2-MAKEOPTS.patch, + files/mercury-0.12.2-libgrades.patch, files/mercury-0.13.0-MAKEOPTS.patch, + files/mercury-0.13.0-libgrades.patch: + Run mmake depend in stage 2 bootstrap. 16 Sep 2006; keri <keri@gentoo.org> files/mercury-0.12.2-libgrades.patch, files/mercury-0.13.0-libgrades.patch: diff --git a/dev-lang/mercury/files/mercury-0.12.2-MAKEOPTS.patch b/dev-lang/mercury/files/mercury-0.12.2-MAKEOPTS.patch index c6905e8dc166..3ae10194664b 100644 --- a/dev-lang/mercury/files/mercury-0.12.2-MAKEOPTS.patch +++ b/dev-lang/mercury/files/mercury-0.12.2-MAKEOPTS.patch @@ -9,3 +9,11 @@ SHELL= /bin/sh MMAKE= MMAKE_DIR=`pwd`/scripts scripts/mmake MMAKE_SUBDIR= MMAKE_DIR=`pwd`/../scripts ../scripts/mmake $(PARALLEL) +@@ -69,6 +69,6 @@ + $(MMAKE) uninstall + + .DEFAULT: +- $(MMAKE) $@ ++ $(MMAKE) MMAKEFLAGS=$(PARALLEL) $@ + + #-----------------------------------------------------------------------------# diff --git a/dev-lang/mercury/files/mercury-0.12.2-libgrades.patch b/dev-lang/mercury/files/mercury-0.12.2-libgrades.patch index 39fca8329e9d..e9cc8caa3ace 100644 --- a/dev-lang/mercury/files/mercury-0.12.2-libgrades.patch +++ b/dev-lang/mercury/files/mercury-0.12.2-libgrades.patch @@ -1,16 +1,3 @@ ---- mercury-compiler-0.12.2.orig/Makefile 2006-09-16 21:58:43.000000000 +1200 -+++ mercury-compiler-0.12.2/Makefile 2006-09-16 21:59:37.000000000 +1200 -@@ -28,6 +28,10 @@ - all: - $(MMAKE) MMAKEFLAGS=$(PARALLEL) all 2>&1 || exit 1 - -+.PHONY: libgrades -+libgrades: -+ $(MMAKE) MMAKEFLAGS=$(PARALLEL) libgrades 2>&1 || exit 1 -+ - .PHONY: libmmc - libmmc: - $(MMAKE) MMAKEFLAGS=$(PARALLEL) libmmc --- mercury-compiler-0.12.2.orig/Mmakefile 2005-01-28 20:11:29.000000000 +1300 +++ mercury-compiler-0.12.2/Mmakefile 2006-08-12 09:45:55.000000000 +1200 @@ -233,6 +233,54 @@ diff --git a/dev-lang/mercury/files/mercury-0.13.0-MAKEOPTS.patch b/dev-lang/mercury/files/mercury-0.13.0-MAKEOPTS.patch index ac3c8b79d949..30892a68c74a 100644 --- a/dev-lang/mercury/files/mercury-0.13.0-MAKEOPTS.patch +++ b/dev-lang/mercury/files/mercury-0.13.0-MAKEOPTS.patch @@ -9,3 +9,11 @@ SHELL= /bin/sh MMAKE= MMAKE_DIR=`pwd`/scripts scripts/mmake MMAKE_SUBDIR= MMAKE_DIR=`pwd`/../scripts ../scripts/mmake $(PARALLEL) +@@ -69,6 +69,6 @@ + $(MMAKE) uninstall + + .DEFAULT: +- $(MMAKE) $@ ++ $(MMAKE) MMAKEFLAGS=$(PARALLEL) $@ + + #-----------------------------------------------------------------------------# diff --git a/dev-lang/mercury/files/mercury-0.13.0-libgrades.patch b/dev-lang/mercury/files/mercury-0.13.0-libgrades.patch index 50a2a4266c92..fe027c4d083d 100644 --- a/dev-lang/mercury/files/mercury-0.13.0-libgrades.patch +++ b/dev-lang/mercury/files/mercury-0.13.0-libgrades.patch @@ -1,16 +1,3 @@ ---- mercury-compiler-0.13.0.orig/Makefile 2005-08-22 15:38:34.000000000 +1200 -+++ mercury-compiler-0.13.0/Makefile 2006-09-16 22:10:24.000000000 +1200 -@@ -28,6 +28,10 @@ - all: - $(MMAKE) MMAKEFLAGS=$(PARALLEL) all - -+.PHONY: libgrades -+libgrades: -+ $(MMAKE) MMAKEFLAGS=$(PARALLEL) libgrades -+ - .PHONY: libmmc - libmmc: - $(MMAKE) MMAKEFLAGS=$(PARALLEL) libmmc --- mercury-compiler-0.13.0.orig/Mmakefile 2005-08-12 03:56:57.000000000 +1200 +++ mercury-compiler-0.13.0/Mmakefile 2006-09-16 11:58:30.000000000 +1200 @@ -281,6 +281,54 @@ |