From 8cd7f1a9010eb9119ba7bbd5b1f36ec34fbfd4ca Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 9 Apr 2015 09:21:53 +0200 Subject: [PATCH] Revert "xbps-src: Set the MAKEFLAGS environment variable" This reverts commit d803775b3df2ad81dc584ce1d599f08b3ba1c17a. This breaks all pkgs that exec make directly without ${makejobs} (which should be built as -j1) and makes installation also parallel, which we do not want. We'll probably resurrect this in a certain future. --- common/xbps-src/shutils/common.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh index 2e9535c85c3..9753f83069e 100644 --- a/common/xbps-src/shutils/common.sh +++ b/common/xbps-src/shutils/common.sh @@ -217,7 +217,7 @@ setup_pkg() { [ -z "$pkg" ] && return 1 # Start with a sane environment - unset -v MAKEFLAGS PKG_BUILD_OPTIONS XBPS_CROSS_CFLAGS XBPS_CROSS_CXXFLAGS XBPS_CROSS_CPPFLAGS XBPS_CROSS_LDFLAGS + unset -v PKG_BUILD_OPTIONS XBPS_CROSS_CFLAGS XBPS_CROSS_CXXFLAGS XBPS_CROSS_CPPFLAGS XBPS_CROSS_LDFLAGS unset -v subpackages run_depends build_depends host_build_depends unset_package_funcs @@ -377,10 +377,6 @@ setup_pkg() { fi fi - if [ -n "${makejobs}" ]; then - export MAKEFLAGS="${makejobs}" - fi - export CFLAGS="$XBPS_TARGET_CFLAGS $XBPS_CFLAGS $XBPS_CROSS_CFLAGS $CFLAGS $dbgflags" export CXXFLAGS="$XBPS_TARGET_CXXFLAGS $XBPS_CXXFLAGS $XBPS_CROSS_CXXFLAGS $CXXFLAGS $dbgflags" export CPPFLAGS="$XBPS_TARGET_CPPFLAGS $XBPS_CPPFLAGS $XBPS_CROSS_CPPFLAGS $CPPFLAGS"