CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Maya Rashish" <maya%netbsd.org@localhost>
Date: Sun, 19 Jan 2020 16:52:47 +0000

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun Jan 19 16:52:47 UTC 2020

Modified Files:
        pkgsrc/devel/cbindgen: Makefile
        pkgsrc/graphics/librsvg: Makefile distinfo
        pkgsrc/sysutils/exa: Makefile
        pkgsrc/textproc/bat: Makefile
        pkgsrc/textproc/ripgrep: Makefile
        pkgsrc/www/geckodriver: Makefile
Added Files:
        pkgsrc/graphics/librsvg/patches: patch-Makefile.in

Log Message:
Make cargo packages respect MAKE_JOBS


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/cbindgen/Makefile
cvs rdiff -u -r1.113 -r1.114 pkgsrc/graphics/librsvg/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/graphics/librsvg/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/librsvg/patches/patch-Makefile.in
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/exa/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/bat/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/ripgrep/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/geckodriver/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/cbindgen/Makefile
diff -u pkgsrc/devel/cbindgen/Makefile:1.11 pkgsrc/devel/cbindgen/Makefile:1.12
--- pkgsrc/devel/cbindgen/Makefile:1.11 Thu Jan  9 14:56:28 2020
+++ pkgsrc/devel/cbindgen/Makefile      Sun Jan 19 16:52:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/01/09 14:56:28 ryoon Exp $
+# $NetBSD: Makefile,v 1.12 2020/01/19 16:52:46 maya Exp $
 
 DISTNAME=      cbindgen-0.12.1
 CATEGORIES=    devel
@@ -48,7 +48,7 @@ CARGO_CRATE_DEPENDS+= winapi-x86_64-pc-w
 INSTALLATION_DIRS=     bin
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${EFFECTIVE_MAKE_JOBS}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/cbindgen ${DESTDIR}${PREFIX}/bin

Index: pkgsrc/graphics/librsvg/Makefile
diff -u pkgsrc/graphics/librsvg/Makefile:1.113 pkgsrc/graphics/librsvg/Makefile:1.114
--- pkgsrc/graphics/librsvg/Makefile:1.113      Tue Dec 31 11:36:52 2019
+++ pkgsrc/graphics/librsvg/Makefile    Sun Jan 19 16:52:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2019/12/31 11:36:52 wiz Exp $
+# $NetBSD: Makefile,v 1.114 2020/01/19 16:52:46 maya Exp $
 
 DISTNAME=      librsvg-2.46.4
 CATEGORIES=    graphics gnome
@@ -11,6 +11,7 @@ COMMENT=      SVG library for GNOME
 LICENSE=       gnu-lgpl-v2
 
 MAKE_JOBS_SAFE=        NO
+MAKE_FLAGS+=   CARGO_MAKE_JOBS=-j${EFFECTIVE_MAKE_JOBS}
 
 USE_LIBTOOL=           yes
 USE_TOOLS+=            pkg-config gmake aclocal autoconf automake

Index: pkgsrc/graphics/librsvg/distinfo
diff -u pkgsrc/graphics/librsvg/distinfo:1.43 pkgsrc/graphics/librsvg/distinfo:1.44
--- pkgsrc/graphics/librsvg/distinfo:1.43       Tue Dec 31 11:36:52 2019
+++ pkgsrc/graphics/librsvg/distinfo    Sun Jan 19 16:52:46 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.43 2019/12/31 11:36:52 wiz Exp $
+$NetBSD: distinfo,v 1.44 2020/01/19 16:52:46 maya Exp $
 
 SHA1 (aho-corasick-0.7.6.crate) = 5844a153c8b9f67a91e2640e0aa66ee493b0f5ab
 RMD160 (aho-corasick-0.7.6.crate) = 78c8c7e93bbcf52f761f90b7096cc9331ad3bfc6
@@ -576,3 +576,4 @@ SHA1 (xml-rs-0.8.0.crate) = a86917e26b65
 RMD160 (xml-rs-0.8.0.crate) = 8ed8d898ab2d1b1ef5c6d391da2c9bfe4bba95a7
 SHA512 (xml-rs-0.8.0.crate) = 94f0bc729d58564d63b4708518313e3dc7fe7c6ff9ac94019df1507d7ce7bd6428f2bc16fb116a9d676415a94812ce1e54e30b469a2a9b5fe29dc82486c536cd
 Size (xml-rs-0.8.0.crate) = 50974 bytes
+SHA1 (patch-Makefile.in) = d8cd4f26c6744a458d8f0735da29653c60ab66f4

Index: pkgsrc/sysutils/exa/Makefile
diff -u pkgsrc/sysutils/exa/Makefile:1.1 pkgsrc/sysutils/exa/Makefile:1.2
--- pkgsrc/sysutils/exa/Makefile:1.1    Thu Jul 18 00:22:13 2019
+++ pkgsrc/sysutils/exa/Makefile        Sun Jan 19 16:52:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/07/18 00:22:13 fox Exp $
+# $NetBSD: Makefile,v 1.2 2020/01/19 16:52:46 maya Exp $
 
 DISTNAME=      exa-0.9.0
 CATEGORIES=    sysutils
@@ -85,7 +85,7 @@ INSTALLATION_DIRS=    bin \
                        share/zsh/site-functions
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${EFFECTIVE_MAKE_JOBS}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/exa ${DESTDIR}${PREFIX}/bin

Index: pkgsrc/textproc/bat/Makefile
diff -u pkgsrc/textproc/bat/Makefile:1.4 pkgsrc/textproc/bat/Makefile:1.5
--- pkgsrc/textproc/bat/Makefile:1.4    Fri Sep  6 17:32:04 2019
+++ pkgsrc/textproc/bat/Makefile        Sun Jan 19 16:52:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/09/06 17:32:04 fox Exp $
+# $NetBSD: Makefile,v 1.5 2020/01/19 16:52:47 maya Exp $
 
 DISTNAME=      bat-0.12.1
 PKGREVISION=   1
@@ -159,7 +159,7 @@ CARGO_CRATE_DEPENDS+=       yaml-rust-0.4.3
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${EFFECTIVE_MAKE_JOBS}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/bat ${DESTDIR}${PREFIX}/bin

Index: pkgsrc/textproc/ripgrep/Makefile
diff -u pkgsrc/textproc/ripgrep/Makefile:1.6 pkgsrc/textproc/ripgrep/Makefile:1.7
--- pkgsrc/textproc/ripgrep/Makefile:1.6        Tue Dec  3 16:34:29 2019
+++ pkgsrc/textproc/ripgrep/Makefile    Sun Jan 19 16:52:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/12/03 16:34:29 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2020/01/19 16:52:47 maya Exp $
 
 DISTNAME=      ripgrep-11.0.2
 CATEGORIES=    textproc
@@ -79,7 +79,7 @@ CARGO_CRATE_DEPENDS+= wincolor-1.0.1
 INSTALLATION_DIRS=     bin
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${EFFECTIVE_MAKE_JOBS}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/rg ${DESTDIR}${PREFIX}/bin

Index: pkgsrc/www/geckodriver/Makefile
diff -u pkgsrc/www/geckodriver/Makefile:1.8 pkgsrc/www/geckodriver/Makefile:1.9
--- pkgsrc/www/geckodriver/Makefile:1.8 Mon Jul 22 23:48:31 2019
+++ pkgsrc/www/geckodriver/Makefile     Sun Jan 19 16:52:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/07/22 23:48:31 tnn Exp $
+# $NetBSD: Makefile,v 1.9 2020/01/19 16:52:47 maya Exp $
 
 DISTNAME=      geckodriver-0.24.0
 CATEGORIES=    www
@@ -170,7 +170,7 @@ post-extract:
        cp ${FILESDIR}/Cargo.lock ${WRKSRC}/Cargo.lock
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${EFFECTIVE_MAKE_JOBS}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/geckodriver ${DESTDIR}${PREFIX}/bin

Added files:

Index: pkgsrc/graphics/librsvg/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/graphics/librsvg/patches/patch-Makefile.in:1.1
--- /dev/null   Sun Jan 19 16:52:47 2020
+++ pkgsrc/graphics/librsvg/patches/patch-Makefile.in   Sun Jan 19 16:52:46 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2020/01/19 16:52:46 maya Exp $
+
+Make it possible to respect MAKE_JOBS.
+
+--- Makefile.in.orig   2019-11-21 16:59:53.000000000 +0000
++++ Makefile.in
+@@ -1761,7 +1761,7 @@ librsvg_c_api.la: $(librsvg_c_api_la_OBJ
+       PKG_CONFIG_ALLOW_CROSS=1                                                \
+       PKG_CONFIG='$(PKG_CONFIG)'                                              \
+       CARGO_TARGET_DIR=$(CARGO_TARGET_DIR)                                    \
+-      $(CARGO) --locked build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) \
++      $(CARGO) --locked build $(CARGO_MAKE_JOBS) $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) \
+       && if [[ $$($(NM) -g $(RUST_LIB) | grep "T __*clzsi2" -c) -gt 1 ]] ; then \
+               $(AR) d $(RUST_LIB) clzsi2.o;                                   \
+       fi \

Prev by Date: CVS commit: pkgsrc/mk/build
Next by Date: CVS commit: pkgsrc/lang/rust
Previous by Thread: CVS commit: pkgsrc/mk/build
Next by Thread: CVS commit: pkgsrc/lang/rust
Indexes:

Home | Main Index | Thread Index | Old Index