AaronFiore/electrum
1
0
Fork 0
Code Activity

build: don't hardcode num worker threads "make -j4"

Browse Source
This commit is contained in:
SomberNight
2022-12-03 22:50:18 +00:00
parent 96af21faeb
commit 65ae281180
5 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/build-linux/appimage/make_appimage.sh
View File

@@ -61,7 +61,7 @@ tar xf "$CACHEDIR/Python-$PYTHON_VERSION.tar.xz" -C "$CACHEDIR"
--enable-ipv6 \ --enable-ipv6 \
--enable-shared \ --enable-shared \
-q -q
make -j4 -s || fail "Could not build Python" make "-j$CPU_COUNT" -s || fail "Could not build Python"
) )
info "installing python." info "installing python."
( (
@@ -111,7 +111,7 @@ XCB_UTIL_VERSION="acf790d7752f36e450d476ad79807d4012ec863b"
git checkout "${XCB_UTIL_VERSION}^{commit}" git checkout "${XCB_UTIL_VERSION}^{commit}"
./autogen.sh ./autogen.sh
./configure --enable-shared ./configure --enable-shared
make -j4 -s || fail "Could not build libxcb-util1" make "-j$CPU_COUNT" -s || fail "Could not build libxcb-util1"
) || fail "Could build libxcb-util1" ) || fail "Could build libxcb-util1"
cp "$CACHEDIR/libxcb-util1/util/src/.libs/libxcb-util.so.1" "$APPDIR/usr/lib/libxcb-util.so.1" cp "$CACHEDIR/libxcb-util1/util/src/.libs/libxcb-util.so.1" "$APPDIR/usr/lib/libxcb-util.so.1"

1
contrib/build_tools_util.sh
View File

@@ -129,6 +129,7 @@ if [ -n "$GCC_TRIPLET_BUILD" ] ; then
fi fi
export GCC_STRIP_BINARIES="${GCC_STRIP_BINARIES:-0}" export GCC_STRIP_BINARIES="${GCC_STRIP_BINARIES:-0}"
export CPU_COUNT="$(nproc 2> /dev/null || sysctl -n hw.ncpu)"
function break_legacy_easy_install() { function break_legacy_easy_install() {

2
contrib/make_libsecp256k1.sh
View File

@@ -59,7 +59,7 @@ info "Building $pkgname..."
--disable-static \ --disable-static \
--enable-shared || fail "Could not configure $pkgname. Please make sure you have a C compiler installed and try again." --enable-shared || fail "Could not configure $pkgname. Please make sure you have a C compiler installed and try again."
fi fi
make -j4 || fail "Could not build $pkgname" make "-j$CPU_COUNT" || fail "Could not build $pkgname"
make install || fail "Could not install $pkgname" make install || fail "Could not install $pkgname"
. "$here/$pkgname/dist/lib/libsecp256k1.la" . "$here/$pkgname/dist/lib/libsecp256k1.la"
host_strip "$here/$pkgname/dist/lib/$dlname" host_strip "$here/$pkgname/dist/lib/$dlname"

2
contrib/make_libusb.sh
View File

@@ -47,7 +47,7 @@ info "Building $pkgname..."
$AUTOCONF_FLAGS \ $AUTOCONF_FLAGS \
|| fail "Could not configure $pkgname. Please make sure you have a C compiler installed and try again." || fail "Could not configure $pkgname. Please make sure you have a C compiler installed and try again."
fi fi
make -j4 || fail "Could not build $pkgname" make "-j$CPU_COUNT" || fail "Could not build $pkgname"
make install || warn "Could not install $pkgname" make install || warn "Could not install $pkgname"
. "$here/$pkgname/libusb/.libs/libusb-1.0.la" . "$here/$pkgname/libusb/.libs/libusb-1.0.la"
host_strip "$here/$pkgname/libusb/.libs/$dlname" host_strip "$here/$pkgname/libusb/.libs/$dlname"

2
contrib/make_zbar.sh
View File

@@ -81,7 +81,7 @@ info "Building $pkgname..."
--disable-static \ --disable-static \
--enable-shared || fail "Could not configure $pkgname. Please make sure you have a C compiler installed and try again." --enable-shared || fail "Could not configure $pkgname. Please make sure you have a C compiler installed and try again."
fi fi
make -j4 || fail "Could not build $pkgname" make "-j$CPU_COUNT" || fail "Could not build $pkgname"
make install || fail "Could not install $pkgname" make install || fail "Could not install $pkgname"
. "$here/$pkgname/dist/lib/libzbar.la" . "$here/$pkgname/dist/lib/libzbar.la"
host_strip "$here/$pkgname/dist/lib/$dlname" host_strip "$here/$pkgname/dist/lib/$dlname"