[pkgsrc/trunk]: pkgsrc Rename EFFECTIVE_MAKE_JOBS -> _MAKE_JOBS_N, suggested ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Rename EFFECTIVE_MAKE_JOBS -> _MAKE_JOBS_N, suggested ...
From: maya <maya%pkgsrc.org@localhost>
Date: Sun, 19 Jan 2020 19:12:22 +0000

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8b98b6a894fc
branches:  trunk
changeset: 409717:8b98b6a894fc
user:      maya <maya%pkgsrc.org@localhost>
date:      Sun Jan 19 18:20:45 2020 +0000

description:
Rename EFFECTIVE_MAKE_JOBS -> _MAKE_JOBS_N, suggested by gdt.

I am under the impression we use _THING to mean "defined by the
implementation", which would be similar to the C meaning of __ prefix,
rather than "private to this file".

diffstat:

 devel/cbindgen/Makefile   |   4 ++--
 graphics/librsvg/Makefile |   4 ++--
 mk/build/build.mk         |  16 ++++++++--------
 sysutils/exa/Makefile     |   4 ++--
 textproc/bat/Makefile     |   4 ++--
 textproc/ripgrep/Makefile |   4 ++--
 www/geckodriver/Makefile  |   4 ++--
 7 files changed, 20 insertions(+), 20 deletions(-)

diffs (147 lines):

diff -r e63639781214 -r 8b98b6a894fc devel/cbindgen/Makefile
--- a/devel/cbindgen/Makefile   Sun Jan 19 16:53:10 2020 +0000
+++ b/devel/cbindgen/Makefile   Sun Jan 19 18:20:45 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/01/19 16:52:46 maya Exp $
+# $NetBSD: Makefile,v 1.13 2020/01/19 18:20:45 maya Exp $
 
 DISTNAME=      cbindgen-0.12.1
 CATEGORIES=    devel
@@ -48,7 +48,7 @@
 INSTALLATION_DIRS=     bin
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${EFFECTIVE_MAKE_JOBS}
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${_MAKE_JOBS_N}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/cbindgen ${DESTDIR}${PREFIX}/bin
diff -r e63639781214 -r 8b98b6a894fc graphics/librsvg/Makefile
--- a/graphics/librsvg/Makefile Sun Jan 19 16:53:10 2020 +0000
+++ b/graphics/librsvg/Makefile Sun Jan 19 18:20:45 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.114 2020/01/19 16:52:46 maya Exp $
+# $NetBSD: Makefile,v 1.115 2020/01/19 18:20:46 maya Exp $
 
 DISTNAME=      librsvg-2.46.4
 CATEGORIES=    graphics gnome
@@ -11,7 +11,7 @@
 LICENSE=       gnu-lgpl-v2
 
 MAKE_JOBS_SAFE=        NO
-MAKE_FLAGS+=   CARGO_MAKE_JOBS=-j${EFFECTIVE_MAKE_JOBS}
+MAKE_FLAGS+=   CARGO_MAKE_JOBS=-j${_MAKE_JOBS_N}
 
 USE_LIBTOOL=           yes
 USE_TOOLS+=            pkg-config gmake aclocal autoconf automake
diff -r e63639781214 -r 8b98b6a894fc mk/build/build.mk
--- a/mk/build/build.mk Sun Jan 19 16:53:10 2020 +0000
+++ b/mk/build/build.mk Sun Jan 19 18:20:45 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.29 2020/01/19 16:51:47 maya Exp $
+# $NetBSD: build.mk,v 1.30 2020/01/19 18:20:46 maya Exp $
 #
 # This file defines what happens in the build phase, excluding the
 # self-test, which is defined in test.mk.
@@ -38,7 +38,7 @@
 # Keywords: build make
 
 _VARGROUPS+=           build
-_DEF_VARS.build=       EFFECTIVE_MAKE_JOBS
+_DEF_VARS.build=       _MAKE_JOBS_N
 _USER_VARS.build=      MAKE_JOBS BUILD_ENV_SHELL
 _PKG_VARS.build=       MAKE_ENV MAKE_FLAGS BUILD_MAKE_FLAGS BUILD_TARGET MAKE_JOBS_SAFE
 _SYS_VARS.build=       BUILD_MAKE_CMD
@@ -55,14 +55,14 @@
                        -f ${MAKE_FILE}
 
 .if defined(MAKE_JOBS_SAFE) && !empty(MAKE_JOBS_SAFE:M[nN][oO])
-_MAKE_JOBS=            # nothing
-EFFECTIVE_MAKE_JOBS=   1
+_MAKE_JOBS=    # nothing
+_MAKE_JOBS_N=  1
 .elif defined(MAKE_JOBS.${PKGPATH})
-_MAKE_JOBS=            -j${MAKE_JOBS.${PKGPATH}}
-EFFECTIVE_MAKE_JOBS=   ${MAKE_JOBS.${PKGPATH}}
+_MAKE_JOBS=    -j${MAKE_JOBS.${PKGPATH}}
+_MAKE_JOBS_N=  ${MAKE_JOBS.${PKGPATH}}
 .elif defined(MAKE_JOBS)
-_MAKE_JOBS=            -j${MAKE_JOBS}
-EFFECTIVE_MAKE_JOBS=   ${MAKE_JOBS}
+_MAKE_JOBS=    -j${MAKE_JOBS}
+_MAKE_JOBS_N=  ${MAKE_JOBS}
 .endif
 
 ######################################################################
diff -r e63639781214 -r 8b98b6a894fc sysutils/exa/Makefile
--- a/sysutils/exa/Makefile     Sun Jan 19 16:53:10 2020 +0000
+++ b/sysutils/exa/Makefile     Sun Jan 19 18:20:45 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/01/19 16:52:46 maya Exp $
+# $NetBSD: Makefile,v 1.3 2020/01/19 18:20:45 maya Exp $
 
 DISTNAME=      exa-0.9.0
 CATEGORIES=    sysutils
@@ -85,7 +85,7 @@
                        share/zsh/site-functions
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${EFFECTIVE_MAKE_JOBS}
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${_MAKE_JOBS_N}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/exa ${DESTDIR}${PREFIX}/bin
diff -r e63639781214 -r 8b98b6a894fc textproc/bat/Makefile
--- a/textproc/bat/Makefile     Sun Jan 19 16:53:10 2020 +0000
+++ b/textproc/bat/Makefile     Sun Jan 19 18:20:45 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/01/19 16:52:47 maya Exp $
+# $NetBSD: Makefile,v 1.6 2020/01/19 18:20:46 maya Exp $
 
 DISTNAME=      bat-0.12.1
 PKGREVISION=   1
@@ -159,7 +159,7 @@
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${EFFECTIVE_MAKE_JOBS}
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${_MAKE_JOBS_N}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/bat ${DESTDIR}${PREFIX}/bin
diff -r e63639781214 -r 8b98b6a894fc textproc/ripgrep/Makefile
--- a/textproc/ripgrep/Makefile Sun Jan 19 16:53:10 2020 +0000
+++ b/textproc/ripgrep/Makefile Sun Jan 19 18:20:45 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/01/19 16:52:47 maya Exp $
+# $NetBSD: Makefile,v 1.8 2020/01/19 18:20:46 maya Exp $
 
 DISTNAME=      ripgrep-11.0.2
 CATEGORIES=    textproc
@@ -79,7 +79,7 @@
 INSTALLATION_DIRS=     bin
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${EFFECTIVE_MAKE_JOBS}
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${_MAKE_JOBS_N}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/rg ${DESTDIR}${PREFIX}/bin
diff -r e63639781214 -r 8b98b6a894fc www/geckodriver/Makefile
--- a/www/geckodriver/Makefile  Sun Jan 19 16:53:10 2020 +0000
+++ b/www/geckodriver/Makefile  Sun Jan 19 18:20:45 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/01/19 16:52:47 maya Exp $
+# $NetBSD: Makefile,v 1.10 2020/01/19 18:20:46 maya Exp $
 
 DISTNAME=      geckodriver-0.24.0
 CATEGORIES=    www
@@ -170,7 +170,7 @@
        cp ${FILESDIR}/Cargo.lock ${WRKSRC}/Cargo.lock
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${EFFECTIVE_MAKE_JOBS}
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${_MAKE_JOBS_N}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/geckodriver ${DESTDIR}${PREFIX}/bin

Prev by Date: [pkgsrc/trunk]: pkgsrc/lang/rust Mark all cargo-using packages as MAKE_JOBS_S...
Next by Date: [pkgsrc/trunk]: pkgsrc/lang/rust rust: mark MAKE_JOBS_SAFE=no on NetBSD.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/lang/rust Mark all cargo-using packages as MAKE_JOBS_S...
Next by Thread: [pkgsrc/trunk]: pkgsrc/lang/rust rust: mark MAKE_JOBS_SAFE=no on NetBSD.
Indexes:

Home | Main Index | Thread Index | Old Index