This is an automated email from the git hooks/post-receive script.

gk pushed a commit to branch master in repository builders/tor-browser-build.

The following commit(s) were added to refs/heads/master by this push: new 2d10beb Bug 40546: Update rbm and use new options from rbm 2d10beb is described below

commit 2d10beb41810c4390d6303f3304ac3f035006eff Author: Nicolas Vigier boklm@torproject.org AuthorDate: Mon Jul 4 09:54:18 2022 +0200

Bug 40546: Update rbm and use new options from rbm

We update rbm to a new commit, which includes new default options (and adds support for modules). We are now using those new options and remove them from rbm.conf. --- README | 9 +++++---- projects/binutils/build | 2 +- projects/cctools/build | 2 +- projects/clang/build | 4 ++-- projects/cmake/build | 2 +- projects/gcc/build | 2 +- projects/libdmg-hfsplus/build | 2 +- projects/libevent/build | 2 +- projects/lucetc/build | 2 +- projects/mingw-w64-clang/build | 22 +++++++++++----------- projects/mingw-w64/build | 10 +++++----- projects/nasm/build | 2 +- projects/node/build | 2 +- projects/python/build | 2 +- projects/rust/build | 2 +- projects/tor-browser/build | 18 +++++++++--------- projects/tor-browser/ddmg.sh | 2 +- projects/tor/build | 4 ++-- projects/wasi-sysroot/build | 2 +- projects/zlib/build | 8 ++++---- projects/zstd/build | 2 +- rbm | 2 +- rbm.conf | 34 +++------------------------------- rbm.local.conf.example | 11 ++++++----- 24 files changed, 62 insertions(+), 88 deletions(-)

diff --git a/README b/README index 1e7a4b9..dcfe4c7 100644 --- a/README +++ b/README @@ -108,13 +108,14 @@ fetching of new commits for nightly builds in rbm.local.conf. Number of make processes ------------------------

-By default the builds are run with 4 processes simultaneously (with -make -j4). If you want to change the number of processes used, you can -set the RBM_NUM_PROCS environment variable: +By default `nproc` is used to determine the number of processes to run +simultaneously (with make -jN where N is the number returned by `nproc`). +If you want to change the number of processes used, you can set the +RBM_NUM_PROCS environment variable:

$ export RBM_NUM_PROCS=8

-You can also set the buildconf/num_procs option in rbm.local.conf. +You can also set the num_procs option in rbm.local.conf.

Automated builds diff --git a/projects/binutils/build b/projects/binutils/build index f1cf0b9..c2f4433 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -12,7 +12,7 @@ distdir=/var/tmp/dist/binutils tar xf [% project %]-[% c("version") %].tar.xz cd [% project %]-[% c("version") %] ./configure --prefix=$distdir [% c('var/configure_opt') %] -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install

[% IF c("var/linux") %] diff --git a/projects/cctools/build b/projects/cctools/build index b8d7523..8668785 100644 --- a/projects/cctools/build +++ b/projects/cctools/build @@ -24,7 +24,7 @@ perl -pi -e 's/(LIBTOOLIZE -c)/\1 -f/' autogen.sh --enable-tapi-support \ --with-libtapi=$distdir

-make -j[% c("buildconf/num_procs") %] install +make -j[% c("num_procs") %] install strip $distdir/bin/* # cctools doesn't include dsymutil but clang will need to find it. cp $CLANG_DIR/bin/dsymutil $distdir/bin/x86_64-apple-darwin-dsymutil diff --git a/projects/clang/build b/projects/clang/build index d913c6d..241a7f1 100644 --- a/projects/clang/build +++ b/projects/clang/build @@ -33,7 +33,7 @@ cmake ../llvm -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \ [% END -%] [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly[% END %] \ -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;compiler-rt;libcxx;libcxxabi;lld" -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install

[% IF c("var/android") -%] @@ -58,7 +58,7 @@ make install -DCOMPILER_RT_BUILD_PROFILE=OFF \ -DCOMPILER_RT_BUILD_SANITIZERS=OFF \ -DCOMPILER_RT_BUILD_XRAY=OFF - make -j[% c("buildconf/num_procs") %] + make -j[% c("num_procs") %] make install }

diff --git a/projects/cmake/build b/projects/cmake/build index e8613a2..5162565 100644 --- a/projects/cmake/build +++ b/projects/cmake/build @@ -9,7 +9,7 @@ mkdir /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] ./bootstrap --prefix=$distdir -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/projects/gcc/build b/projects/gcc/build index bd7e837..1b43ee1 100644 --- a/projects/gcc/build +++ b/projects/gcc/build @@ -21,7 +21,7 @@ mkdir /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c("version") %].tar.xz cd /var/tmp/build/[% project %]-[% c("version") %] ./configure --prefix=$distdir [% c("var/configure_opt") %] -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/projects/libdmg-hfsplus/build b/projects/libdmg-hfsplus/build index 80d5f75..cdcec2d 100644 --- a/projects/libdmg-hfsplus/build +++ b/projects/libdmg-hfsplus/build @@ -7,7 +7,7 @@ cd [% project %]-[% c('version') %] patch -p1 < ../libdmg.patch cmake -DCMAKE_INSTALL_PREFIX:PATH=$distdir/[% project %] CMakeLists.txt cd dmg -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install cd $distdir [% c('tar', { diff --git a/projects/libevent/build b/projects/libevent/build index ae15551..4708f9d 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -11,7 +11,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" [% END -%] -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/projects/lucetc/build b/projects/lucetc/build index 5ff071f..cd80ac7 100644 --- a/projects/lucetc/build +++ b/projects/lucetc/build @@ -49,7 +49,7 @@ EOF

patch -p1 < $rootdir/Remove-march-native-from-COMMON_CFLAGS.patch

-make -j[% c("buildconf/num_procs") %] build +make -j[% c("num_procs") %] build # XXX: Should not be needed, just the lucetc binary, see: taskcluster/scripts/misc/build-lucetc.sh make install

diff --git a/projects/mingw-w64-clang/build b/projects/mingw-w64-clang/build index 00b1171..81f7567 100644 --- a/projects/mingw-w64-clang/build +++ b/projects/mingw-w64-clang/build @@ -71,7 +71,7 @@ mkdir build && cd build --with-default-msvcrt=ucrt \ --with-default-win32-winnt=$default_win32_winnt \ --prefix=$distdir/[% c("arch") %]-w64-mingw32 -make -j[% c("buildconf/num_procs") %] install +make -j[% c("num_procs") %] install

cd $builddir/mingw-w64-clang/mingw-w64-crt mkdir build && cd build @@ -83,14 +83,14 @@ mkdir build && cd build RANLIB=llvm-ranlib \ DLLTOOL=llvm-dlltool \ --prefix=$distdir/[% c("arch") %]-w64-mingw32 -make -j[% c("buildconf/num_procs") %] -make -j[% c("buildconf/num_procs") %] install +make -j[% c("num_procs") %] +make -j[% c("num_procs") %] install

cd $builddir/mingw-w64-clang/mingw-w64-tools/widl mkdir build && cd build ../configure --target=[% c("arch") %]-w64-mingw32 --prefix=$distdir -make -j[% c("buildconf/num_procs") %] -make -j[% c("buildconf/num_procs") %] install +make -j[% c("num_procs") %] +make -j[% c("num_procs") %] install

# compiler-rt cd $builddir/clang-source/compiler-rt @@ -104,7 +104,7 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER_TARGET=$compiler_rt_machine-windows-gnu \ -DCOMPILER_RT_DEFAULT_TARGET_ONLY=TRUE \ $builddir/clang-source/compiler-rt/lib/builtins - make -j[% c("buildconf/num_procs") %] + make -j[% c("num_procs") %] rtdir=$distdir/lib/clang/[% pc("llvm-project", "version") %]/lib/windows mkdir -p $rtdir cp lib/windows/libclang_rt.builtins-$compiler_rt_machine.a $rtdir/ @@ -134,8 +134,8 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CXX_FLAGS="-Wno-dll-attribute-on-redeclaration -nostdinc++ -I$builddir/clang-source/libcxx/include -DPSAPI_VERSION=2" \ -DCMAKE_C_FLAGS="-Wno-dll-attribute-on-redeclaration" \ $builddir/clang-source/libunwind -make -j[% c("buildconf/num_procs") %] -make -j[% c("buildconf/num_procs") %] install +make -j[% c("num_procs") %] +make -j[% c("num_procs") %] install

# libcxxabi cd $builddir/clang-source/libcxxabi @@ -163,7 +163,7 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DCXX_SUPPORTS_CXX_STD=True \ -DCMAKE_CXX_FLAGS="-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCPP_HAS_THREAD_API_WIN32" \ $builddir/clang-source/libcxxabi -make -j[% c("buildconf/num_procs") %] VERBOSE=1 +make -j[% c("num_procs") %] VERBOSE=1

# libcxx cd $builddir/clang-source/libcxx @@ -196,8 +196,8 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DLIBCXX_CXX_ABI_LIBRARY_PATH=$builddir/clang-source/libcxxabi/build/lib \ -DCMAKE_CXX_FLAGS="-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS" \ $builddir/clang-source/libcxx -make -j[% c("buildconf/num_procs") %] VERBOSE=1 -make -j[% c("buildconf/num_procs") %] install +make -j[% c("num_procs") %] VERBOSE=1 +make -j[% c("num_procs") %] install

# libc++.a depends on libunwind.a. While the linker will automatically link to # libc++.a in C++ mode, it won't pick libunwind.a, requiring the caller to diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 2d8e8e2..9ab8450 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -27,14 +27,14 @@ tar xJf $rootdir/gcc-[% c("var/gcc_version") %].tar.xz export CFLAGS_FOR_TARGET="-Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-insert-timestamp [% c('var/flag_noSEH') %]" # Rust requires enabling pthreads gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=[% c("arch") %]-w64-mingw32 --with-gnu-ld --with-gnu-as --disable-multilib --enable-threads=posix --enable-languages=c,c++[% IF c("var/windows-i686") %] --disable-sjlj-exceptions --with-dwarf2[% END %] -make -j[% c("buildconf/num_procs") %] all-gcc +make -j[% c("num_procs") %] all-gcc make install-gcc

mkdir -p /var/tmp/build/builddir/mingw-w64/mingw-w64-crt32 cd /var/tmp/build/builddir/mingw-w64/mingw-w64-crt32 /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-crt/configure \ --host=[% c("arch") %]-w64-mingw32 --prefix=$distdir/[% c("arch") %]-w64-mingw32 -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install

mkdir -p /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread @@ -42,18 +42,18 @@ cd /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-libraries/winpthreads/configure \ LDFLAGS="-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp [% c('var/flag_noSEH') %]" \ --host=[% c("arch") %]-w64-mingw32 --prefix=$distdir/[% c("arch") %]-w64-mingw32 -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install

mkdir -p /var/tmp/build/builddir/mingw-w64/widl32 cd /var/tmp/build/builddir/mingw-w64/widl32 /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-tools/widl/configure \ --prefix=$distdir --target=[% c("arch") %]-w64-mingw32 -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install

cd /var/tmp/build/gcc -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install mkdir -p $distdir/gcclibs # We compile libssp both for being used dynamically (in tor) and statically (in diff --git a/projects/nasm/build b/projects/nasm/build index 0e6ca04..dc4f25e 100644 --- a/projects/nasm/build +++ b/projects/nasm/build @@ -14,7 +14,7 @@ tar -xf [% project %]-[% c('version') %].tar.xz cd [% project %]-[% c('version') %]

./configure --prefix=$distdir -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install

cd /var/tmp/dist diff --git a/projects/node/build b/projects/node/build index 4a437be..40b797e 100644 --- a/projects/node/build +++ b/projects/node/build @@ -14,7 +14,7 @@ tar -xf [% c('input_files_by_name/node') %] cd node-v[% c('version') %]

./configure --prefix=$distdir -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install

cd /var/tmp/dist diff --git a/projects/python/build b/projects/python/build index 1fff7ce..f8384bf 100644 --- a/projects/python/build +++ b/projects/python/build @@ -5,7 +5,7 @@ mkdir -p $distdir tar xf [% c('input_files_by_name/python') %] cd Python-[% c('version') %] ./configure --prefix=$distdir -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make prefix=$distdir install cd /var/tmp/dist [% c('tar', { diff --git a/projects/rust/build b/projects/rust/build index 2856512..23b3655 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -54,7 +54,7 @@ mkdir build cd build ../configure --prefix=$distdir --disable-docs --disable-compiler-docs [% c("var/configure_opt") %]

-make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/projects/tor-browser/build b/projects/tor-browser/build index a0eab42..041e5f0 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -77,7 +77,7 @@ TMP_MANUAL_PATH=$rootdir/tmp_manual/ mkdir $TMP_MANUAL_PATH pushd $TMP_MANUAL_PATH tar -xf $rootdir/[% c('input_files_by_name/manual') %] -find . -exec [% c("var/touch") %] {} ; +find . -exec [% c("touch") %] {} ; find chrome/ | sort | zip -X -@ "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]/browser/omni.ja" popd rm -rf $TMP_MANUAL_PATH @@ -178,14 +178,14 @@ cp defaults/preferences/000-tor-browser.js $rootdir # Embed our default bookmarks within the en-US locale. mkdir -p chrome/en-US/locale/browser cp -p $rootdir/bookmarks.html chrome/en-US/locale/browser/ - [% c("var/touch") %] chrome/en-US/locale/browser/bookmarks.html + [% c("touch") %] chrome/en-US/locale/browser/bookmarks.html chmod 600 chrome/en-US/locale/browser/bookmarks.html zip -Xm omni.ja chrome/en-US/locale/browser/bookmarks.html rm -rf chrome [% END %] # Set the locale of the bundle. echo "pref("intl.locale.requested", "en-US");" >> defaults/preferences/000-tor-browser.js -[% c("var/touch") %] defaults/preferences/000-tor-browser.js +[% c("touch") %] defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults # create tbb_version.json file for #25020 @@ -224,7 +224,7 @@ popd # app.update.url). pushd "$TBDIR[% IF c("var/osx") %]/Contents/Resources/[% END %]" echo ${PKG_LOCALE} > update.locale - [% c("var/touch") %] update.locale + [% c("touch") %] update.locale zip -Xm omni.ja update.locale popd [% END %] @@ -280,7 +280,7 @@ cd $distdir dmg_out => '$OUTDIR/TorBrowser-' _ c("var/torbrowser_version") _ '-osx64_${PKG_LOCALE}.dmg', }) %] [% ELSIF c("var/windows") %] - find "$PKG_DIR" -exec [% c("var/touch") %] {} ; + find "$PKG_DIR" -exec [% c("touch") %] {} ; pushd "$PKG_DIR" makensis torbrowser.nsi # Working around NSIS braindamage @@ -358,7 +358,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ cp $rootdir/000-tor-browser.js defaults/preferences/ # Set the locale of the bundle. echo "pref("intl.locale.requested", "[% lang %]");" >> defaults/preferences/000-tor-browser.js - [% c("var/touch") %] defaults/preferences/000-tor-browser.js + [% c("touch") %] defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults # create tbb_version.json file for #25020 @@ -370,7 +370,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ # recreate precomplete file (needs to be accurate for full MAR updates). pushd "[% browserdir %]/[% IF c("var/osx") %]Contents/Resources/[% END %]" echo "[% lang %]" > update.locale - [% c("var/touch") %] update.locale + [% c("touch") %] update.locale zip -Xm omni.ja update.locale rm -rf dictionaries rm -f precomplete @@ -403,7 +403,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ dmg_out => '$OUTDIR/TorBrowser-' _ c("var/torbrowser_version") _ '-osx64_' _ lang _ '.dmg', }) %] [% ELSIF c("var/windows") %] - find "[% tbdir %]" -exec [% c("var/touch") %] {} ; + find "[% tbdir %]" -exec [% c("touch") %] {} ; pushd "[% tbdir %]" makensis torbrowser.nsi # Working around NSIS braindamage @@ -420,4 +420,4 @@ SCRIPT_EOF [% END %]

chmod 775 $rootdir/run_scripts "$scripts_dir"/* -$rootdir/run_scripts [% c("buildconf/num_procs") %] "$scripts_dir" +$rootdir/run_scripts [% c("num_procs") %] "$scripts_dir" diff --git a/projects/tor-browser/ddmg.sh b/projects/tor-browser/ddmg.sh index 97fddb1..1c27cbd 100755 --- a/projects/tor-browser/ddmg.sh +++ b/projects/tor-browser/ddmg.sh @@ -2,7 +2,7 @@ find [% src %] -executable -exec chmod 0755 {} ; find [% src %] ! -executable -exec chmod 0644 {} ;

-find [% src %] -exec [% c("var/touch") %] {} ; +find [% src %] -exec [% c("touch") %] {} ;

dmg_tmpdir=$(mktemp -d) [% SET filelist = '"$dmg_tmpdir/filelist.txt"' %] diff --git a/projects/tor/build b/projects/tor/build index 9c46910..08a1c20 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -83,7 +83,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] # add git hash to micro-revision.i for #24995 echo '"[% c("abbrev", { abbrev_length => 16 }) %]"' > micro-revision.i ./autogen.sh -find -type f -print0 | xargs -0 [% c("var/touch") %] +find -type f -print0 | xargs -0 [% c("touch") %] ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \ [% IF c("var/asan") %]--enable-fragile-hardening[% END %] \ [% IF c("var/windows") || c("var/android") %]--with-zlib-dir="$zlibdir"[% END %] \ @@ -93,7 +93,7 @@ find -type f -print0 | xargs -0 [% c("var/touch") %] export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" [% END -%] -make -j[% c("buildconf/num_procs") %] +make -j[% c("num_procs") %] make install [% IF c("var/osx") -%] unset LD_PRELOAD diff --git a/projects/wasi-sysroot/build b/projects/wasi-sysroot/build index 8ab9524..fbfa5ad 100644 --- a/projects/wasi-sysroot/build +++ b/projects/wasi-sysroot/build @@ -30,7 +30,7 @@ EOF

# XXX: We don't want to use the clang 9.0 wasi-sdk would use, see: # https://bugzilla.mozilla.org/show_bug.cgi?id=1605708 -make -j[% c("buildconf/num_procs") %] PREFIX=$distdir/[% project %] DESTDIR=/ +make -j[% c("num_procs") %] PREFIX=$distdir/[% project %] DESTDIR=/

cd $distdir [% c('tar', { diff --git a/projects/zlib/build b/projects/zlib/build index 943a895..55381dd 100644 --- a/projects/zlib/build +++ b/projects/zlib/build @@ -10,16 +10,16 @@ cd /var/tmp/build/[% project %]-[% c('version') %] patch -p1 < $rootdir/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch

[% IF c("var/windows") -%] - make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("buildconf/num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" - make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("buildconf/num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" install + make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" + make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" install [% END -%]

[% IF c("var/android") -%] export CHOST=[% c("var/cross_prefix") %] export CC=[% c("var/CC") %] ./configure --prefix=$distdir - make -j[% c("buildconf/num_procs") %] - make -j[% c("buildconf/num_procs") %] install + make -j[% c("num_procs") %] + make -j[% c("num_procs") %] install # Only need static libraries rm -r $distdir/lib/{*.so*,pkgconfig} [% END -%] diff --git a/projects/zstd/build b/projects/zstd/build index 974c815..8d75193 100644 --- a/projects/zstd/build +++ b/projects/zstd/build @@ -8,7 +8,7 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] export CPPFLAGS=-DZSTD_MULTITHREAD export CC=[% c("var/CC") %] -make -C lib -j[% c("buildconf/num_procs") %] PREFIX=$distdir install +make -C lib -j[% c("num_procs") %] PREFIX=$distdir install # Only need static libraries rm $distdir/lib/libzstd.so* cd /var/tmp/dist diff --git a/rbm b/rbm index d3bc044..98be5a6 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit d3bc044d450a3d8c739902564e563d3931cf52f4 +Subproject commit 98be5a6247850ecbdf9641a96b176a071dab2f5b diff --git a/rbm.conf b/rbm.conf index c2191ff..365bbf7 100644 --- a/rbm.conf +++ b/rbm.conf @@ -1,6 +1,5 @@ # vim: filetype=yaml sw=2 debug: '[% GET ! ENV.RBM_NO_DEBUG %]' -compress_tar: gz output_dir: "out/[% project %]" tmp_dir: '[% c("basedir") %]/tmp' build_log: '[% GET ENV.RBM_LOGS_DIR ? ENV.RBM_LOGS_DIR : "logs" %]/[% project %][% IF c("var/osname") %]-[% c("var/osname") %][% END %].log' @@ -62,7 +61,6 @@ steps: # When adding a new option to buildconf, a default value should be defined # in var/build_id, so that changing this option does not affect the build_id. buildconf: - num_procs: '[% GET ENV.RBM_NUM_PROCS ? ENV.RBM_NUM_PROCS : "4" %]' git_signtag_opt: '-s'

var: @@ -78,7 +76,7 @@ var: # in the same order. In the cases where the installation order is # important, sort_deps should be set to 0. sort_deps: 1 - build_id: '[% sha256(c("var/build_id_txt", { buildconf => { num_procs => 4 } })).substr(0, 6) %]' + build_id: '[% sha256(c("var/build_id_txt", { num_procs => 4 })).substr(0, 6) %]' build_id_txt: | [% c("version") %] [% IF c("git_hash") || c("hg_hash"); GET c("abbrev"); END; %] @@ -97,8 +95,6 @@ var: # disable network in the build scripts build: 1

- touch: "[% USE date %]touch -m -t [% date.format(c('timestamp'), format = '%Y%m%d%H%M') %]" - locale_ja: ja locales: - ar @@ -488,29 +484,9 @@ targets: container: global_disable: 1

-# change the default gpg_wrapper to allow git tag signed using an -# expired key. +# allow git tag signed using an expired key. # https://bugs.torproject.org/19737 -gpg_wrapper: | - #!/bin/bash - export LC_ALL=C - [% - IF c('gpg_keyring'); - SET gpg_kr = '--keyring ' _ path(c('gpg_keyring'), path(c('gpg_keyring_dir'))) _ ' --no-default-keyring'; - END; - -%] - gpg_verify=0 - for opt in "$@" - do - test "$opt" = '--verify' && gpg_verify=1 - done - if [ $gpg_verify = 1 ] - then - [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "$@" | sed 's/^[GNUPG:] EXPKEYSIG /[GNUPG:] GOODSIG /' - exit ${PIPESTATUS[0]} - else - exec [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "$@" - fi +gpg_allow_expired_keys: 1

remote_start: '[% IF c("var/container/use_container") && ! c("var/container/global_disable") %][% c("container/remote_start") %][% END %]' remote_exec: '[% IF c("var/container/use_container") && ! c("var/container/global_disable") %][% c("container/remote_exec") %][% END %]' @@ -582,10 +558,6 @@ container: #!/bin/sh set -e [% c("rbmdir") %]/container remove '[% c("var/container/dir") %]' - -ENV: - TZ: UTC - LC_ALL: C --- | # This part of the file contains options written in perl use IO::CaptureOutput qw(capture_exec); diff --git a/rbm.local.conf.example b/rbm.local.conf.example index 9f5ad4e..c4aa163 100644 --- a/rbm.local.conf.example +++ b/rbm.local.conf.example @@ -28,14 +28,15 @@ ### when starting a new build. #build_log_append: 0

+### The num_procs option can be used to select the number of +### build processes to run simultaneously. You can also use the +### RBM_NUM_PROCS environment variable. The default is the number of +### processing units available, as returned by `nproc`. +#num_procs: 8 + buildconf: buildconf: 1

- ### The buildconf/num_procs option can be used to select the number of - ### build processes to run simultaneously. You can also use the - ### RBM_NUM_PROCS environment variable. The default is 4. - #num_procs: 8 - ### The buildconf/git_signtag_opt option is useful when you tag a release. ### It is used to set the 'git tag' argument to select the keyid for ### signing the tag.