dev-lang/mercury: handle spaces in mercury PARALLEL args

Package-Manager: Portage-2.3.40, Repoman-2.3.9

diff --git a/dev-lang/mercury/mercury-13.05.2.ebuild b/dev-lang/mercury/mercury-13.05.2.ebuild
index b0836202a1bf6d931c3864263f51758e2daf5321..99339c2a2bc4d7f0f67b297d21d7c74258af76cf 100644 (file)
--- a/dev-lang/mercury/mercury-13.05.2.ebuild
+++ b/dev-lang/mercury/mercury-13.05.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -69,7 +69,7 @@ src_configure() {
 src_compile() {
        # Build Mercury using base llds grade
        emake \
-               PARALLEL=${MAKEOPTS} \
+               PARALLEL="'${MAKEOPTS}'" \
                MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
                            EXTRA_LDFLAGS='${LDFLAGS}' \
                            EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \
@@ -88,7 +88,7 @@ src_compile() {
 
        # Rebuild Mercury compiler using the just built mercury_compiler
        emake \
-               PARALLEL=${MAKEOPTS} \
+               PARALLEL="'${MAKEOPTS}'" \
                MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
                            EXTRA_LDFLAGS='${LDFLAGS}' \
                            EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \
@@ -99,7 +99,7 @@ src_compile() {
        # compile the llds base grade. Since src_test() is run before
        # src_install() we compile the default grade now
        emake \
-               PARALLEL=${MAKEOPTS} \
+               PARALLEL="'${MAKEOPTS}'" \
                MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
                            EXTRA_LDFLAGS='${LDFLAGS}' \
                            EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \
@@ -141,7 +141,7 @@ src_test() {
 
 src_install() {
        emake \
-               PARALLEL=${MAKEOPTS} \
+               PARALLEL="'${MAKEOPTS}'" \
                MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
                            EXTRA_LDFLAGS='${LDFLAGS}' \
                            EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \

diff --git a/dev-lang/mercury/mercury-14.01.1.ebuild b/dev-lang/mercury/mercury-14.01.1.ebuild
index f192627fc96ee58a8c56360f6af2562d4b8fdeb4..65cb6d098ab2c20be352eb30f3775b58b7bc3b5b 100644 (file)
--- a/dev-lang/mercury/mercury-14.01.1.ebuild
+++ b/dev-lang/mercury/mercury-14.01.1.ebuild
@@ -77,7 +77,7 @@ src_compile() {
 
        # Build Mercury using bootstrap grade
        emake \
-               PARALLEL="${MAKEOPTS}" \
+               PARALLEL="'${MAKEOPTS}'" \
                || die "emake failed"
 
        # We can now patch .m Mercury compiler files since we
@@ -95,7 +95,7 @@ src_compile() {
 
        # Rebuild Mercury compiler using the just built mercury_compiler
        emake \
-               PARALLEL="${MAKEOPTS}" \
+               PARALLEL="'${MAKEOPTS}'" \
                MERCURY_COMPILER="${S}"/compiler/mercury_compile \
                compiler || die "emake compiler failed"
 
@@ -103,7 +103,7 @@ src_compile() {
        # grade. Since src_test() is run before src_install() we compile
        # the default grade now
        emake \
-               PARALLEL="${MAKEOPTS}" \
+               PARALLEL="'${MAKEOPTS}'" \
                MERCURY_COMPILER="${S}"/compiler/mercury_compile \
                default_grade || die "emake default_grade failed"
 }
@@ -147,7 +147,7 @@ src_test() {
 
 src_install() {
        emake \
-               PARALLEL="${MAKEOPTS}" \
+               PARALLEL="'${MAKEOPTS}'" \
                MERCURY_COMPILER="${S}"/compiler/mercury_compile \
                DESTDIR="${D}" \
                INSTALL_PREFIX="${D}"/usr \

diff --git a/dev-lang/mercury/mercury-14.01.ebuild b/dev-lang/mercury/mercury-14.01.ebuild
index 003906b05debd26b453cec89f4d9a7482b7a73c4..3ef81523edacfb147464c61dc1351d271a484f37 100644 (file)
--- a/dev-lang/mercury/mercury-14.01.ebuild
+++ b/dev-lang/mercury/mercury-14.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -72,7 +72,7 @@ src_configure() {
 src_compile() {
        # Build Mercury using base llds grade
        emake \
-               PARALLEL=${MAKEOPTS} \
+               PARALLEL="'${MAKEOPTS}'" \
                MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
                            EXTRA_CFLAGS='${CFLAGS}' \
                            EXTRA_LDFLAGS='${LDFLAGS}'" \
@@ -93,7 +93,7 @@ src_compile() {
 
        # Rebuild Mercury compiler using the just built mercury_compiler
        emake \
-               PARALLEL=${MAKEOPTS} \
+               PARALLEL="'${MAKEOPTS}'" \
                MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
                            EXTRA_CFLAGS='${CFLAGS}' \
                            EXTRA_LDFLAGS='${LDFLAGS}'" \
@@ -104,7 +104,7 @@ src_compile() {
        # compile the llds base grade. Since src_test() is run before
        # src_install() we compile the default grade now
        emake \
-               PARALLEL=${MAKEOPTS} \
+               PARALLEL="'${MAKEOPTS}'" \
                MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
                            EXTRA_CFLAGS='${CFLAGS}' \
                            EXTRA_LDFLAGS='${LDFLAGS}'" \
@@ -146,7 +146,7 @@ src_test() {
 
 src_install() {
        emake \
-               PARALLEL=${MAKEOPTS} \
+               PARALLEL="'${MAKEOPTS}'" \
                MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \
                            EXTRA_CFLAGS='${CFLAGS}' \
                            EXTRA_LDFLAGS='${LDFLAGS}'" \