diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2018-12-13 11:47:59 +0000 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2018-12-13 11:47:59 +0000 |
| commit | ad4e58bff78d4e5b6816b67d7dd1691beeefd74e (patch) | |
| tree | 9638e201ceb1729521410d248af02d1a8b41b18d | |
| parent | a082a8bcdbc742dbcc390d6def5ba082ff19b865 (diff) | |
Fixed numthreads in dependencies also
Some problems with using the number of threads in dependency building were
fixed.
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | reproduce/src/make/dependencies-basic.mk | 6 | ||||
| -rw-r--r-- | reproduce/src/make/dependencies.mk | 8 |
3 files changed, 8 insertions, 7 deletions
@@ -674,6 +674,7 @@ numthreads=$($instdir/bin/nproc) rpath_command=$rpath_command \ static_build=$static_build \ on_mac_os=$on_mac_os \ + numthreads=$numthreads \ -j$numthreads diff --git a/reproduce/src/make/dependencies-basic.mk b/reproduce/src/make/dependencies-basic.mk index a852ae0..823a515 100644 --- a/reproduce/src/make/dependencies-basic.mk +++ b/reproduce/src/make/dependencies-basic.mk @@ -407,9 +407,9 @@ $(ibdir)/ls: $(tdir)/coreutils-$(coreutils-version).tar.xz \ $(ilidir)/openssl # Coreutils will use the hashing features of OpenSSL's `libcrypto'. # See Tar's comments for the `-j' option. - $(call gbuild, $<, coreutils-$(coreutils-version), static, \ - LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ - --enable-rpath --disable-silent-rules --with-openssl, + $(call gbuild, $<, coreutils-$(coreutils-version), static, \ + LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ + --enable-rpath --disable-silent-rules --with-openssl, \ -j$(numthreads)) $(ibdir)/pkg-config: $(tdir)/pkg-config-$(pkgconfig-version).tar.gz \ diff --git a/reproduce/src/make/dependencies.mk b/reproduce/src/make/dependencies.mk index 836bcfc..2b5a118 100644 --- a/reproduce/src/make/dependencies.mk +++ b/reproduce/src/make/dependencies.mk @@ -336,11 +336,11 @@ $(ibdir)/astnoisechisel: $(tdir)/gnuastro-$(gnuastro-version).tar.lz \ $(ilidir)/wcslib ifeq ($(static_build),yes) $(call gbuild, $<, gnuastro-$(gnuastro-version), static, \ - --enable-static=yes --enable-shared=no, -j8, \ - make check -j8) + --enable-static=yes --enable-shared=no, \ + -j$(numthreads), make check -j$(numthreads)) else - $(call gbuild, $<, gnuastro-$(gnuastro-version), , , -j8, \ - make check -j8) + $(call gbuild, $<, gnuastro-$(gnuastro-version), , , \ + -j$(numthreads), make check -j$(numthreads)) endif |