Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   ArchLinux Pacman Development (http://www.linux-archive.org/archlinux-pacman-development/)
-   -   makepkg: remove distcc/makeflags option interaction (http://www.linux-archive.org/archlinux-pacman-development/543557-makepkg-remove-distcc-makeflags-option-interaction.html)

Allan McRae 06-23-2011 09:47 PM

makepkg: remove distcc/makeflags option interaction
 
On 24/06/11 06:20, Dan McGee wrote:

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
linkage.

Signed-off-by: Dan McGee<dan@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
- MAKEFLAGS=""
fi

# use ccache if it is requested (check buildenv and PKGBUILD opts)


Ack,
Allan


All times are GMT. The time now is 04:35 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.