commit 63e5119ceb83e7f005c6c4983c49c6d1506c87b2
parent 9d2b601cc7998afe10c1a2e239df4a051adf85a0
Author: SomberNight <somber.night@protonmail.com>
Date: Tue, 11 Jun 2019 20:02:28 +0200
builds: parallelise "make" by setting "-j4"
Diffstat:
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/contrib/build-linux/appimage/build.sh b/contrib/build-linux/appimage/build.sh
@@ -4,10 +4,11 @@ set -e
PROJECT_ROOT="$(dirname "$(readlink -e "$0")")/../../.."
CONTRIB="$PROJECT_ROOT/contrib"
+CONTRIB_APPIMAGE="$CONTRIB/build-linux/appimage"
DISTDIR="$PROJECT_ROOT/dist"
-BUILDDIR="$CONTRIB/build-linux/appimage/build/appimage"
+BUILDDIR="$CONTRIB_APPIMAGE/build/appimage"
APPDIR="$BUILDDIR/electrum.AppDir"
-CACHEDIR="$CONTRIB/build-linux/appimage/.cache/appimage"
+CACHEDIR="$CONTRIB_APPIMAGE/.cache/appimage"
# pinned versions
PYTHON_VERSION=3.6.8
@@ -49,7 +50,7 @@ tar xf "$CACHEDIR/Python-$PYTHON_VERSION.tar.xz" -C "$BUILDDIR"
--enable-shared \
--with-threads \
-q
- TZ=UTC faketime -f '2019-01-01 01:01:01' make -s
+ TZ=UTC faketime -f '2019-01-01 01:01:01' make -j4 -s
make -s install > /dev/null
)
@@ -71,7 +72,7 @@ info "building libsecp256k1."
--enable-module-ecdh \
--disable-jni \
-q
- make -s
+ make -j4 -s
make -s install > /dev/null
)
@@ -127,7 +128,7 @@ cp "$PROJECT_ROOT/electrum/gui/icons/electrum.png" "$APPDIR/electrum.png"
# add launcher
-cp "$CONTRIB/build-linux/appimage/apprun.sh" "$APPDIR/AppRun"
+cp "$CONTRIB_APPIMAGE/apprun.sh" "$APPDIR/AppRun"
info "finalizing AppDir."
(
diff --git a/contrib/build-wine/build-secp256k1.sh b/contrib/build-wine/build-secp256k1.sh
@@ -14,7 +14,7 @@ build_dll() {
--enable-experimental \
--enable-module-ecdh \
--disable-jni
- make
+ make -j4
${1}-strip .libs/libsecp256k1-0.dll
}
diff --git a/contrib/osx/make_osx b/contrib/osx/make_osx
@@ -89,7 +89,7 @@ git reset --hard $LIBSECP_VERSION
git clean -f -x -q
./autogen.sh
./configure --enable-module-recovery --enable-experimental --enable-module-ecdh --disable-jni
-make
+make -j4
popd
cp $BUILDDIR/secp256k1/.libs/libsecp256k1.0.dylib contrib/osx