[pacman-dev] [PATCH] makepkg: remove distcc/makeflags option interaction

Dan McGee dan at archlinux.org
Thu Jun 23 16:20:53 EDT 2011

Way back in c94bfbaba when refactoring makepkg options handling, I added
these lines to unset MAKEFLAGS if '!distcc' was set in a PKGBUILD (not
taking into account makepkg.conf settings). This was an attempt to say
"if it is broken in distcc, it is probably broken even more". However,
this is silly as one should be using '!makeflags' as well. Remove the

Signed-off-by: Dan McGee <dan at archlinux.org>
 scripts/makepkg.sh.in |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 239bb64..cd94ac9 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -822,9 +822,6 @@ run_build() {
 	if [[ $(check_buildenv distcc) = "y" && $(check_option distcc) != "n" ]]; then
 		[[ -d /usr/lib/distcc/bin ]] && export PATH="/usr/lib/distcc/bin:$PATH"
 		export DISTCC_HOSTS
-	elif [[ $(check_option distcc) = "n" ]]; then
-		# if it is not wanted, clear the makeflags too
 	# use ccache if it is requested (check buildenv and PKGBUILD opts)

More information about the pacman-dev mailing list