Bug 1430030 - Enable parallelism when building wine, upx and fxc2. r?build draft
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 12 Jan 2018 17:51:00 +0900
changeset 719532 2f8ac1212926666e8134029de1357340bbe20a2d
parent 719510 9517df1f4b1b7be45c6ffce4c6123e917fb2acf5
child 745822 f4c665b59d6151a5b847a0a98f94148f739a4ba2
push id95283
push userbmo:mh+mozilla@glandium.org
push dateFri, 12 Jan 2018 09:35:37 +0000
reviewersbuild
bugs1430030
milestone59.0a1
Bug 1430030 - Enable parallelism when building wine, upx and fxc2. r?build
taskcluster/scripts/misc/build-mingw32-fxc2.sh
taskcluster/scripts/misc/build-upx.sh
taskcluster/scripts/misc/build-wine.sh
--- a/taskcluster/scripts/misc/build-mingw32-fxc2.sh
+++ b/taskcluster/scripts/misc/build-mingw32-fxc2.sh
@@ -15,17 +15,17 @@ export PATH="$TOOLTOOL_DIR/mingw32/bin:$
 
 cd $WORKSPACE
 
 # --------------
 
 git clone -n https://github.com/mozilla/fxc2.git fxc2-clone
 cd fxc2-clone
 git checkout 82527b81104e5e21390d3ddcd328700c67ce73d4 # Asserts integrity of the clone (right?)
-make
+make -j$(nproc)
 
 cp fxc2.exe $INSTALL_DIR/bin/
 cp d3dcompiler_47.dll $INSTALL_DIR/bin/
 cp $TOOLTOOL_DIR/mingw32/i686-w64-mingw32/bin/libwinpthread-1.dll $INSTALL_DIR/bin/
 
 # --------------
 
 cd $WORKSPACE
--- a/taskcluster/scripts/misc/build-upx.sh
+++ b/taskcluster/scripts/misc/build-upx.sh
@@ -12,29 +12,29 @@ cd $WORKSPACE
 
 # --------------
 
 wget http://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz
 echo "5847003d136fbbca1334dd5de10554c76c755f7c  ucl-1.03.tar.gz" | sha1sum -c -
 tar xf ucl-1.03.tar.gz
 cd ucl-1.03
 ./configure
-make
+make -j$(nproc)
 
 # --------------
 
 cd ..
 git clone -n https://github.com/upx/upx.git upx-clone
 cd upx-clone
 git checkout d31947e1f016e87f24f88b944439bbee892f0429 # Asserts integrity of the clone (right?)
 git submodule update --init --recursive
 export UPX_UCLDIR=$WORKSPACE/ucl-1.03
 cd src
-make
+make -j$(nproc)
 cp upx.out $INSTALL_DIR/bin/upx
 
 # --------------
 
 cd $WORKSPACE
 tar caf upx.tar.xz upx
 
 mkdir -p $UPLOAD_DIR
-cp upx.tar.* $UPLOAD_DIR
\ No newline at end of file
+cp upx.tar.* $UPLOAD_DIR
--- a/taskcluster/scripts/misc/build-wine.sh
+++ b/taskcluster/scripts/misc/build-wine.sh
@@ -70,17 +70,17 @@ mOMR1xJlCiQvAQYsmqwM9FHDmGJYTQE1WbVZu4gZ
 =6vF7
 -----END PGP PUBLIC KEY BLOCK-----
 EOF
 
 download_and_check http://dl.winehq.org/wine/source/2.0/ wine-2.0.1.tar.xz.sign
 tar xaf $TMPDIR/wine-2.0.1.tar.xz
 cd wine-2.0.1
 ./configure --prefix=$INSTALL_DIR/
-make
+make -j$(nproc)
 make install
 
 # --------------
 
 cd $WORKSPACE/
 tar caf wine.tar.xz wine
 
 mkdir -p $UPLOAD_DIR