summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2006-09-11 09:51:58 +0000
committerKeri Harris <keri@gentoo.org>2006-09-11 09:51:58 +0000
commit6e9aed508c0fc50f0f38f5db40a08e7a94a155ab (patch)
tree97bdf73f1a578a810f5946d0f2c25af504a28fbe /dev-lang/mercury
parentUse the freetype interpreter for Type 1 fonts, as pretty much everyone else i... (diff)
downloadgentoo-2-6e9aed508c0fc50f0f38f5db40a08e7a94a155ab.tar.gz
gentoo-2-6e9aed508c0fc50f0f38f5db40a08e7a94a155ab.tar.bz2
gentoo-2-6e9aed508c0fc50f0f38f5db40a08e7a94a155ab.zip
Parallelize compilation.
(Portage version: 2.1.1)
Diffstat (limited to 'dev-lang/mercury')
-rw-r--r--dev-lang/mercury/ChangeLog7
-rw-r--r--dev-lang/mercury/files/mercury-0.12.2-MAKEOPTS.patch11
-rw-r--r--dev-lang/mercury/files/mercury-0.13.0_beta-MAKEOPTS.patch11
-rw-r--r--dev-lang/mercury/mercury-0.12.2-r3.ebuild3
-rw-r--r--dev-lang/mercury/mercury-0.13.0_beta20060907.ebuild3
5 files changed, 32 insertions, 3 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 95bc66dc9b85..cf02c0effc43 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.39 2006/09/10 10:49:53 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.40 2006/09/11 09:51:58 keri Exp $
+
+ 11 Sep 2006; keri <keri@gentoo.org> +files/mercury-0.12.2-MAKEOPTS.patch,
+ +files/mercury-0.13.0_beta-MAKEOPTS.patch, mercury-0.12.2-r3.ebuild,
+ mercury-0.13.0_beta20060907.ebuild:
+ Parallelize compilation.
10 Sep 2006; keri <keri@gentoo.org> files/mercury-0.12.2-bootstrap.patch,
files/mercury-0.13.0_beta-bootstrap.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
new file mode 100644
index 000000000000..c6905e8dc166
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.12.2-MAKEOPTS.patch
@@ -0,0 +1,11 @@
+--- mercury-compiler-0.12.2.orig/Makefile 2004-11-01 17:46:18.000000000 +1300
++++ mercury-compiler-0.12.2/Makefile 2006-09-11 20:50:59.000000000 +1200
+@@ -15,7 +15,7 @@
+ #
+ #-----------------------------------------------------------------------------#
+
+-
++PARALLEL= $(MAKEOPTS)
+ SHELL= /bin/sh
+ MMAKE= MMAKE_DIR=`pwd`/scripts scripts/mmake
+ MMAKE_SUBDIR= MMAKE_DIR=`pwd`/../scripts ../scripts/mmake $(PARALLEL)
diff --git a/dev-lang/mercury/files/mercury-0.13.0_beta-MAKEOPTS.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-MAKEOPTS.patch
new file mode 100644
index 000000000000..ea1a60c9f618
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.13.0_beta-MAKEOPTS.patch
@@ -0,0 +1,11 @@
+--- mercury-compiler-0.13.0-beta-2006-09-07.orig/Makefile 2005-08-22 15:38:34.000000000 +1200
++++ mercury-compiler-0.13.0-beta-2006-09-07/Makefile 2006-09-11 21:20:49.000000000 +1200
+@@ -15,7 +15,7 @@
+ #
+ #-----------------------------------------------------------------------------#
+
+-
++PARALLEL= $(MAKEOPTS)
+ SHELL= /bin/sh
+ MMAKE= MMAKE_DIR=`pwd`/scripts scripts/mmake
+ MMAKE_SUBDIR= MMAKE_DIR=`pwd`/../scripts ../scripts/mmake $(PARALLEL)
diff --git a/dev-lang/mercury/mercury-0.12.2-r3.ebuild b/dev-lang/mercury/mercury-0.12.2-r3.ebuild
index 6f2e3d791f88..878230463eca 100644
--- a/dev-lang/mercury/mercury-0.12.2-r3.ebuild
+++ b/dev-lang/mercury/mercury-0.12.2-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.12.2-r3.ebuild,v 1.2 2006/08/14 07:51:40 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.12.2-r3.ebuild,v 1.3 2006/09/11 09:51:58 keri Exp $
inherit eutils
@@ -28,6 +28,7 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}"/${P}-portage-r3.patch
epatch "${FILESDIR}"/${P}-CFLAGS.patch
+ epatch "${FILESDIR}"/${P}-MAKEOPTS.patch
epatch "${FILESDIR}"/${P}-bootstrap.patch
epatch "${FILESDIR}"/${P}-LIBDIR.patch
epatch "${FILESDIR}"/${P}-libgrades.patch
diff --git a/dev-lang/mercury/mercury-0.13.0_beta20060907.ebuild b/dev-lang/mercury/mercury-0.13.0_beta20060907.ebuild
index 9166e575be71..e9bfeb04a2b6 100644
--- a/dev-lang/mercury/mercury-0.13.0_beta20060907.ebuild
+++ b/dev-lang/mercury/mercury-0.13.0_beta20060907.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.0_beta20060907.ebuild,v 1.1 2006/09/09 06:28:04 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.0_beta20060907.ebuild,v 1.2 2006/09/11 09:51:58 keri Exp $
inherit eutils versionator
@@ -33,6 +33,7 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}"/${P/${BETA_V}/beta}-portage.patch
epatch "${FILESDIR}"/${P/${BETA_V}/beta}-CFLAGS.patch
+ epatch "${FILESDIR}"/${P/${BETA_V}/beta}-MAKEOPTS.patch
epatch "${FILESDIR}"/${P/${BETA_V}/beta}-bootstrap.patch
epatch "${FILESDIR}"/${P/${BETA_V}/beta}-LIBDIR.patch
epatch "${FILESDIR}"/${P/${BETA_V}/beta}-libgrades.patch