Subject: CVS commit: pkgsrc/mk
To: None <pkgsrc-changes@NetBSD.org>
From: Johnny C. Lam <jlam@netbsd.org>
List: pkgsrc-changes
Date: 02/06/2004 04:37:02
Module Name: pkgsrc
Committed By: jlam
Date: Fri Feb 6 04:37:02 UTC 2004
Modified Files:
pkgsrc/mk: bsd.prefs.mk tools.mk
pkgsrc/mk/buildlink2: bsd.buildlink2.mk
pkgsrc/mk/buildlink3: bsd.buildlink3.mk
pkgsrc/mk/compiler: ccache.mk distcc.mk gcc.mk mipspro.mk sunpro.mk
Log Message:
Hiding the PATH from certain phases of the build only accidentally worked
due to a type on gcc.mk that causes the ${_GCC_PREFIX}/bin to always be
prepended to the PATH. The problem that was hiding was "make" resolving
to ${TOOLS_DIR}/bin/make if the package used GNU make, which broke
building since the package Makefile is a BSD Makefile and we passed
PATH to some phases of the build. Fix this by expanding MAKE to the
full path to ${MAKE} in bsd.prefs.mk. We also garbage collect the now
useless checks for PHASES_AFTER_BUILDLINK that cluttered the PREPEND_PATH
code.
To generate a diff of this commit:
cvs rdiff -r1.148 -r1.149 pkgsrc/mk/bsd.prefs.mk
cvs rdiff -r1.24 -r1.25 pkgsrc/mk/tools.mk
cvs rdiff -r1.111 -r1.112 pkgsrc/mk/buildlink2/bsd.buildlink2.mk
cvs rdiff -r1.76 -r1.77 pkgsrc/mk/buildlink3/bsd.buildlink3.mk
cvs rdiff -r1.9 -r1.10 pkgsrc/mk/compiler/ccache.mk \
pkgsrc/mk/compiler/sunpro.mk
cvs rdiff -r1.12 -r1.13 pkgsrc/mk/compiler/distcc.mk \
pkgsrc/mk/compiler/mipspro.mk
cvs rdiff -r1.38 -r1.39 pkgsrc/mk/compiler/gcc.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.