| 1 |
commit: 1e49d9a72ee97e6b4325f81b8fbd541ee4f341e8 |
| 2 |
Author: Keri Harris <keri <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 16 19:45:20 2018 +0000 |
| 4 |
Commit: Keri Harris <keri <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 16 19:45:43 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e49d9a7 |
| 7 |
|
| 8 |
dev-lang/mercury: handle spaces in mercury PARALLEL args |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 11 |
|
| 12 |
dev-lang/mercury/mercury-13.05.2.ebuild | 10 +++++----- |
| 13 |
dev-lang/mercury/mercury-14.01.1.ebuild | 8 ++++---- |
| 14 |
dev-lang/mercury/mercury-14.01.ebuild | 10 +++++----- |
| 15 |
3 files changed, 14 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-lang/mercury/mercury-13.05.2.ebuild b/dev-lang/mercury/mercury-13.05.2.ebuild |
| 18 |
index b0836202a1b..99339c2a2bc 100644 |
| 19 |
--- a/dev-lang/mercury/mercury-13.05.2.ebuild |
| 20 |
+++ b/dev-lang/mercury/mercury-13.05.2.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2017 Gentoo Foundation |
| 23 |
+# Copyright 1999-2018 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=2 |
| 27 |
@@ -69,7 +69,7 @@ src_configure() { |
| 28 |
src_compile() { |
| 29 |
# Build Mercury using base llds grade |
| 30 |
emake \ |
| 31 |
- PARALLEL=${MAKEOPTS} \ |
| 32 |
+ PARALLEL="'${MAKEOPTS}'" \ |
| 33 |
MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \ |
| 34 |
EXTRA_LDFLAGS='${LDFLAGS}' \ |
| 35 |
EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \ |
| 36 |
@@ -88,7 +88,7 @@ src_compile() { |
| 37 |
|
| 38 |
# Rebuild Mercury compiler using the just built mercury_compiler |
| 39 |
emake \ |
| 40 |
- PARALLEL=${MAKEOPTS} \ |
| 41 |
+ PARALLEL="'${MAKEOPTS}'" \ |
| 42 |
MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \ |
| 43 |
EXTRA_LDFLAGS='${LDFLAGS}' \ |
| 44 |
EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \ |
| 45 |
@@ -99,7 +99,7 @@ src_compile() { |
| 46 |
# compile the llds base grade. Since src_test() is run before |
| 47 |
# src_install() we compile the default grade now |
| 48 |
emake \ |
| 49 |
- PARALLEL=${MAKEOPTS} \ |
| 50 |
+ PARALLEL="'${MAKEOPTS}'" \ |
| 51 |
MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \ |
| 52 |
EXTRA_LDFLAGS='${LDFLAGS}' \ |
| 53 |
EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \ |
| 54 |
@@ -141,7 +141,7 @@ src_test() { |
| 55 |
|
| 56 |
src_install() { |
| 57 |
emake \ |
| 58 |
- PARALLEL=${MAKEOPTS} \ |
| 59 |
+ PARALLEL="'${MAKEOPTS}'" \ |
| 60 |
MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \ |
| 61 |
EXTRA_LDFLAGS='${LDFLAGS}' \ |
| 62 |
EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \ |
| 63 |
|
| 64 |
diff --git a/dev-lang/mercury/mercury-14.01.1.ebuild b/dev-lang/mercury/mercury-14.01.1.ebuild |
| 65 |
index f192627fc96..65cb6d098ab 100644 |
| 66 |
--- a/dev-lang/mercury/mercury-14.01.1.ebuild |
| 67 |
+++ b/dev-lang/mercury/mercury-14.01.1.ebuild |
| 68 |
@@ -77,7 +77,7 @@ src_compile() { |
| 69 |
|
| 70 |
# Build Mercury using bootstrap grade |
| 71 |
emake \ |
| 72 |
- PARALLEL="${MAKEOPTS}" \ |
| 73 |
+ PARALLEL="'${MAKEOPTS}'" \ |
| 74 |
|| die "emake failed" |
| 75 |
|
| 76 |
# We can now patch .m Mercury compiler files since we |
| 77 |
@@ -95,7 +95,7 @@ src_compile() { |
| 78 |
|
| 79 |
# Rebuild Mercury compiler using the just built mercury_compiler |
| 80 |
emake \ |
| 81 |
- PARALLEL="${MAKEOPTS}" \ |
| 82 |
+ PARALLEL="'${MAKEOPTS}'" \ |
| 83 |
MERCURY_COMPILER="${S}"/compiler/mercury_compile \ |
| 84 |
compiler || die "emake compiler failed" |
| 85 |
|
| 86 |
@@ -103,7 +103,7 @@ src_compile() { |
| 87 |
# grade. Since src_test() is run before src_install() we compile |
| 88 |
# the default grade now |
| 89 |
emake \ |
| 90 |
- PARALLEL="${MAKEOPTS}" \ |
| 91 |
+ PARALLEL="'${MAKEOPTS}'" \ |
| 92 |
MERCURY_COMPILER="${S}"/compiler/mercury_compile \ |
| 93 |
default_grade || die "emake default_grade failed" |
| 94 |
} |
| 95 |
@@ -147,7 +147,7 @@ src_test() { |
| 96 |
|
| 97 |
src_install() { |
| 98 |
emake \ |
| 99 |
- PARALLEL="${MAKEOPTS}" \ |
| 100 |
+ PARALLEL="'${MAKEOPTS}'" \ |
| 101 |
MERCURY_COMPILER="${S}"/compiler/mercury_compile \ |
| 102 |
DESTDIR="${D}" \ |
| 103 |
INSTALL_PREFIX="${D}"/usr \ |
| 104 |
|
| 105 |
diff --git a/dev-lang/mercury/mercury-14.01.ebuild b/dev-lang/mercury/mercury-14.01.ebuild |
| 106 |
index 003906b05de..3ef81523eda 100644 |
| 107 |
--- a/dev-lang/mercury/mercury-14.01.ebuild |
| 108 |
+++ b/dev-lang/mercury/mercury-14.01.ebuild |
| 109 |
@@ -1,4 +1,4 @@ |
| 110 |
-# Copyright 1999-2017 Gentoo Foundation |
| 111 |
+# Copyright 1999-2018 Gentoo Foundation |
| 112 |
# Distributed under the terms of the GNU General Public License v2 |
| 113 |
|
| 114 |
EAPI=5 |
| 115 |
@@ -72,7 +72,7 @@ src_configure() { |
| 116 |
src_compile() { |
| 117 |
# Build Mercury using base llds grade |
| 118 |
emake \ |
| 119 |
- PARALLEL=${MAKEOPTS} \ |
| 120 |
+ PARALLEL="'${MAKEOPTS}'" \ |
| 121 |
MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \ |
| 122 |
EXTRA_CFLAGS='${CFLAGS}' \ |
| 123 |
EXTRA_LDFLAGS='${LDFLAGS}'" \ |
| 124 |
@@ -93,7 +93,7 @@ src_compile() { |
| 125 |
|
| 126 |
# Rebuild Mercury compiler using the just built mercury_compiler |
| 127 |
emake \ |
| 128 |
- PARALLEL=${MAKEOPTS} \ |
| 129 |
+ PARALLEL="'${MAKEOPTS}'" \ |
| 130 |
MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \ |
| 131 |
EXTRA_CFLAGS='${CFLAGS}' \ |
| 132 |
EXTRA_LDFLAGS='${LDFLAGS}'" \ |
| 133 |
@@ -104,7 +104,7 @@ src_compile() { |
| 134 |
# compile the llds base grade. Since src_test() is run before |
| 135 |
# src_install() we compile the default grade now |
| 136 |
emake \ |
| 137 |
- PARALLEL=${MAKEOPTS} \ |
| 138 |
+ PARALLEL="'${MAKEOPTS}'" \ |
| 139 |
MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \ |
| 140 |
EXTRA_CFLAGS='${CFLAGS}' \ |
| 141 |
EXTRA_LDFLAGS='${LDFLAGS}'" \ |
| 142 |
@@ -146,7 +146,7 @@ src_test() { |
| 143 |
|
| 144 |
src_install() { |
| 145 |
emake \ |
| 146 |
- PARALLEL=${MAKEOPTS} \ |
| 147 |
+ PARALLEL="'${MAKEOPTS}'" \ |
| 148 |
MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \ |
| 149 |
EXTRA_CFLAGS='${CFLAGS}' \ |
| 150 |
EXTRA_LDFLAGS='${LDFLAGS}'" \ |
Archives