pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc "BUILD_ENV" was misnamed. It's actually the environme...
details: https://anonhg.NetBSD.org/pkgsrc/rev/0a828ec84edf
branches: trunk
changeset: 516463:0a828ec84edf
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Jul 21 14:27:56 2006 +0000
description:
"BUILD_ENV" was misnamed. It's actually the environment that is passed
to all internal recursive make processes. As such, rename it to
"PKGSRC_MAKE_ENV".
XXX Note, some of the usage of this variable in package Makefiles seems
XXX incorrect. They probably want "MAKE_ENV", which is the environment
XXX passed to the make process when running "make" within ${WRKSRC}.
diffstat:
devel/elib/Makefile.common | 6 +++---
devel/monotone-viz/Makefile | 4 ++--
devel/semantic/Makefile | 4 ++--
editors/jde/Makefile | 6 +++---
editors/speedbar/Makefile | 4 ++--
graphics/MesaLib/Makefile | 4 ++--
graphics/TiffIO/Makefile | 4 ++--
lang/libtcl-nothread/buildlink3.mk | 4 ++--
mk/bsd.pkg.barrier.mk | 4 ++--
mk/build/bsd.build-vars.mk | 4 ++--
mk/compiler/ccache.mk | 6 +++---
mk/compiler/distcc.mk | 8 ++++----
mk/compiler/f2c.mk | 4 ++--
multimedia/gst-plugins0.10-ffmpeg/Makefile | 4 ++--
multimedia/xine-lib/Makefile.common | 4 ++--
net/netbsd-tap/options.mk | 4 ++--
x11/xephem/Makefile | 8 ++++----
x11/xhangglider/Makefile | 6 +++---
18 files changed, 44 insertions(+), 44 deletions(-)
diffs (truncated from 343 to 300 lines):
diff -r 57733e1b90e9 -r 0a828ec84edf devel/elib/Makefile.common
--- a/devel/elib/Makefile.common Fri Jul 21 14:27:53 2006 +0000
+++ b/devel/elib/Makefile.common Fri Jul 21 14:27:56 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2006/05/26 19:33:36 joerg Exp $
+# $NetBSD: Makefile.common,v 1.2 2006/07/21 14:27:56 jlam Exp $
#
DISTNAME= elib-1.0
@@ -10,8 +10,8 @@
.include "../../mk/emacs.mk"
-BUILD_ENV+= EMACS=${EMACS_FLAVOR:Q}
-MAKEFLAGS+= EMACS=${EMACS_FLAVOR:Q}
+PKGSRC_MAKE_ENV+= EMACS=${EMACS_FLAVOR:Q}
+MAKEFLAGS+= EMACS=${EMACS_FLAVOR:Q}
NO_CONFIGURE= yes
USE_TOOLS+= gmake makeinfo
diff -r 57733e1b90e9 -r 0a828ec84edf devel/monotone-viz/Makefile
--- a/devel/monotone-viz/Makefile Fri Jul 21 14:27:53 2006 +0000
+++ b/devel/monotone-viz/Makefile Fri Jul 21 14:27:56 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/04/17 13:46:21 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2006/07/21 14:27:56 jlam Exp $
#
DISTNAME= monotone-viz-0.14
@@ -14,7 +14,7 @@
CONFIGURE_ARGS+= --without-local-lablgtk --with-shared-sqlite
USE_TOOLS+= gmake pkg-config
BUILD_TARGET= monotone-viz
-BUILD_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR}
+PKGSRC_MAKE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR}
INSTALLATION_DIRS= bin
do-install:
diff -r 57733e1b90e9 -r 0a828ec84edf devel/semantic/Makefile
--- a/devel/semantic/Makefile Fri Jul 21 14:27:53 2006 +0000
+++ b/devel/semantic/Makefile Fri Jul 21 14:27:56 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/06/17 19:27:04 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2006/07/21 14:27:56 jlam Exp $
#
DISTNAME= semantic-1.4.4
@@ -15,7 +15,7 @@
.include "../../mk/emacs.mk"
-BUILD_ENV+= EMACS=${EMACS_FLAVOR}
+PKGSRC_MAKE_ENV+= EMACS=${EMACS_FLAVOR}
NO_CONFIGURE= yes
USE_TOOLS+= gmake
diff -r 57733e1b90e9 -r 0a828ec84edf editors/jde/Makefile
--- a/editors/jde/Makefile Fri Jul 21 14:27:53 2006 +0000
+++ b/editors/jde/Makefile Fri Jul 21 14:27:56 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/10 23:58:47 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2006/07/21 14:27:56 jlam Exp $
#
DISTNAME= jde-2.3.2
@@ -27,8 +27,8 @@
PKG_DEFAULT_JVM= sun-jdk14
-BUILD_ENV+= EMACS=${EMACS}
-MAKE_ENV+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX:Q}
+PKGSRC_MAKE_ENV+= EMACS=${EMACS}
+MAKE_ENV+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX:Q}
NO_CONFIGURE= yes
diff -r 57733e1b90e9 -r 0a828ec84edf editors/speedbar/Makefile
--- a/editors/speedbar/Makefile Fri Jul 21 14:27:53 2006 +0000
+++ b/editors/speedbar/Makefile Fri Jul 21 14:27:56 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/20 04:59:08 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/07/21 14:27:56 jlam Exp $
#
DISTNAME= speedbar-0.14beta4
@@ -13,7 +13,7 @@
.include "../../mk/emacs.mk"
-BUILD_ENV+= EMACS=${EMACS}
+PKGSRC_MAKE_ENV+= EMACS=${EMACS}
NO_CONFIGURE= yes
USE_TOOLS+= gmake
diff -r 57733e1b90e9 -r 0a828ec84edf graphics/MesaLib/Makefile
--- a/graphics/MesaLib/Makefile Fri Jul 21 14:27:53 2006 +0000
+++ b/graphics/MesaLib/Makefile Fri Jul 21 14:27:56 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/07/06 12:27:43 markd Exp $
+# $NetBSD: Makefile,v 1.49 2006/07/21 14:27:56 jlam Exp $
PKGNAME= MesaLib-${MESA_VERSION}
PKGREVISION= 2
@@ -23,7 +23,7 @@
.else
PTHREAD_STUBLIB= # provided by libc
.endif
-BUILD_ENV+= PTHREAD_STUBLIB=${PTHREAD_STUBLIB}
+PKGSRC_MAKE_ENV+= PTHREAD_STUBLIB=${PTHREAD_STUBLIB}
pre-build:
cd ${WRKSRC} && ${RM} -fr src/glu src/glut progs
diff -r 57733e1b90e9 -r 0a828ec84edf graphics/TiffIO/Makefile
--- a/graphics/TiffIO/Makefile Fri Jul 21 14:27:53 2006 +0000
+++ b/graphics/TiffIO/Makefile Fri Jul 21 14:27:56 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/04/17 13:46:36 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2006/07/21 14:27:56 jlam Exp $
#
DISTNAME= TiffIO-120e
@@ -15,7 +15,7 @@
USE_TOOLS+= gmake
USE_LANGUAGES= c c++
-BUILD_ENV+= QTDIR=${QTDIR:Q}
+PKGSRC_MAKE_ENV+= QTDIR=${QTDIR:Q}
.include "../../devel/zlib/buildlink3.mk"
BUILDLINK_API_DEPENDS.tiff+= tiff>=3.8.1
diff -r 57733e1b90e9 -r 0a828ec84edf lang/libtcl-nothread/buildlink3.mk
--- a/lang/libtcl-nothread/buildlink3.mk Fri Jul 21 14:27:53 2006 +0000
+++ b/lang/libtcl-nothread/buildlink3.mk Fri Jul 21 14:27:56 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/07/21 14:27:56 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TCLNT_BUILDLINK3_MK:= ${TCLNT_BUILDLINK3_MK}+
@@ -25,7 +25,7 @@
BUILDLINK_TRANSFORM+= l:tcl8.4:tcl84-nothread
TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig-nothread.sh
-BUILD_ENV+= _TCL_NOTHREAD=yes
+PKGSRC_MAKE_ENV+= _TCL_NOTHREAD=yes
.endif # TCLNT_BUILDLINK3_MK
diff -r 57733e1b90e9 -r 0a828ec84edf mk/bsd.pkg.barrier.mk
--- a/mk/bsd.pkg.barrier.mk Fri Jul 21 14:27:53 2006 +0000
+++ b/mk/bsd.pkg.barrier.mk Fri Jul 21 14:27:56 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.barrier.mk,v 1.7 2006/07/21 14:21:28 jlam Exp $
+# $NetBSD: bsd.pkg.barrier.mk,v 1.8 2006/07/21 14:27:56 jlam Exp $
_COOKIE.barrier= ${WRKDIR}/.barrier_cookie
@@ -56,7 +56,7 @@
. if defined(PKG_VERBOSE)
@${PHASE_MSG} "Invoking \`\`"${_BARRIER_CMDLINE_TARGETS:Q}"'' after barrier for ${PKGNAME}"
. endif
- ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${BUILD_ENV} ${MAKE} ${MAKEFLAGS} ALLOW_VULNERABLE_PACKAGES= ${_BARRIER_CMDLINE_TARGETS}
+ ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${PKGSRC_MAKE_ENV} ${MAKE} ${MAKEFLAGS} ALLOW_VULNERABLE_PACKAGES= ${_BARRIER_CMDLINE_TARGETS}
. if defined(PKG_VERBOSE)
@${PHASE_MSG} "Leaving \`\`"${_BARRIER_CMDLINE_TARGETS:Q}"'' after barrier for ${PKGNAME}"
. endif
diff -r 57733e1b90e9 -r 0a828ec84edf mk/build/bsd.build-vars.mk
--- a/mk/build/bsd.build-vars.mk Fri Jul 21 14:27:53 2006 +0000
+++ b/mk/build/bsd.build-vars.mk Fri Jul 21 14:27:56 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.build-vars.mk,v 1.1 2006/07/05 06:09:15 jlam Exp $
+# $NetBSD: bsd.build-vars.mk,v 1.2 2006/07/21 14:27:56 jlam Exp $
#
# BUILD_DIRS is the list of directories in which to perform the build
# process. If the directories are relative paths, then they
@@ -44,4 +44,4 @@
# Add these bits to the environment used when invoking the recursive make
# processes for build-related phases.
#
-BUILD_ENV+= PATH=${PATH:Q}
+PKGSRC_MAKE_ENV+= PATH=${PATH:Q}
diff -r 57733e1b90e9 -r 0a828ec84edf mk/compiler/ccache.mk
--- a/mk/compiler/ccache.mk Fri Jul 21 14:27:53 2006 +0000
+++ b/mk/compiler/ccache.mk Fri Jul 21 14:27:56 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ccache.mk,v 1.26 2005/01/24 18:20:57 tv Exp $
+# $NetBSD: ccache.mk,v 1.27 2006/07/21 14:27:56 jlam Exp $
#
# Copyright (c) 2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -98,10 +98,10 @@
# Override the compiler-specific hash with the version string for the
# compiler.
#
-BUILD_ENV+= CCACHE_HASHCC=${CC_VERSION_STRING:Q}
+PKGSRC_MAKE_ENV+= CCACHE_HASHCC=${CC_VERSION_STRING:Q}
. if defined(CCACHE_DIR) && !empty(CCACHE_DIR)
-BUILD_ENV+= CCACHE_DIR=${CCACHE_DIR:Q}
+PKGSRC_MAKE_ENV+= CCACHE_DIR=${CCACHE_DIR:Q}
. endif
# Create symlinks for the compiler into ${WRKDIR}.
diff -r 57733e1b90e9 -r 0a828ec84edf mk/compiler/distcc.mk
--- a/mk/compiler/distcc.mk Fri Jul 21 14:27:53 2006 +0000
+++ b/mk/compiler/distcc.mk Fri Jul 21 14:27:56 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: distcc.mk,v 1.27 2005/01/24 18:20:57 tv Exp $
+# $NetBSD: distcc.mk,v 1.28 2006/07/21 14:27:56 jlam Exp $
#
# Copyright (c) 2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -96,13 +96,13 @@
BUILD_DEPENDS+= distcc-[0-9]*:../../devel/distcc
. if defined(DISTCC_HOSTS) && !empty(DISTCC_HOSTS)
-BUILD_ENV+= DISTCC_HOSTS=${DISTCC_HOSTS:Q}
+PKGSRC_MAKE_ENV+= DISTCC_HOSTS=${DISTCC_HOSTS:Q}
. endif
. if defined(DISTCC_SSH) && !empty(DISTCC_SSH)
-BUILD_ENV+= DISTCC_SSH=${DISTCC_SSH:Q}
+PKGSRC_MAKE_ENV+= DISTCC_SSH=${DISTCC_SSH:Q}
. endif
. if defined(DISTCC_VERBOSE) && !empty(DISTCC_VERBOSE)
-BUILD_ENV+= DISTCC_VERBOSE=${DISTCC_VERBOSE:Q}
+PKGSRC_MAKE_ENV+= DISTCC_VERBOSE=${DISTCC_VERBOSE:Q}
. endif
# Create symlinks for the compiler into ${WRKDIR}.
diff -r 57733e1b90e9 -r 0a828ec84edf mk/compiler/f2c.mk
--- a/mk/compiler/f2c.mk Fri Jul 21 14:27:53 2006 +0000
+++ b/mk/compiler/f2c.mk Fri Jul 21 14:27:56 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: f2c.mk,v 1.5 2005/03/24 17:46:01 tv Exp $
+# $NetBSD: f2c.mk,v 1.6 2006/07/21 14:27:56 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -99,7 +99,7 @@
. include "../../lang/f2c/buildlink3.mk"
. if defined(F2C_DIR) && !empty(F2C_DIR)
-BUILD_ENV+= F2C_DIR=${F2C_DIR:Q}
+PKGSRC_MAKE_ENV+= F2C_DIR=${F2C_DIR:Q}
. endif
# Create symlinks for the compiler into ${WRKDIR}.
diff -r 57733e1b90e9 -r 0a828ec84edf multimedia/gst-plugins0.10-ffmpeg/Makefile
--- a/multimedia/gst-plugins0.10-ffmpeg/Makefile Fri Jul 21 14:27:53 2006 +0000
+++ b/multimedia/gst-plugins0.10-ffmpeg/Makefile Fri Jul 21 14:27:56 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/07/13 14:19:04 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/07/21 14:27:56 jlam Exp $
#
DISTNAME= gst-ffmpeg-0.10.1
@@ -14,7 +14,7 @@
GNU_CONFIGURE= yes
OVERRIDE_DIRDEPTH= 3
USE_TOOLS+= pkg-config gmake perl
-BUILD_ENV+= PERL=${PERL5}
+PKGSRC_MAKE_ENV+= PERL=${PERL5}
.include "../../multimedia/gstreamer0.10/buildlink3.mk"
.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
diff -r 57733e1b90e9 -r 0a828ec84edf multimedia/xine-lib/Makefile.common
--- a/multimedia/xine-lib/Makefile.common Fri Jul 21 14:27:53 2006 +0000
+++ b/multimedia/xine-lib/Makefile.common Fri Jul 21 14:27:56 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2006/04/13 18:23:36 jlam Exp $
+# $NetBSD: Makefile.common,v 1.34 2006/07/21 14:27:56 jlam Exp $
#
DISTNAME= xine-lib-${XINE_LIB_VER}a
@@ -29,7 +29,7 @@
CONFIGURE_ENV+= have_libpng="yes"
CONFIGURE_ENV+= PNG_CFLAGS="-I${PREFIX}/include"
CONFIGURE_ENV+= PNG_LIBS="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lpng"
-BUILD_ENV+= "mkdir_p"="mkdir -p"
+PKGSRC_MAKE_ENV+= "mkdir_p"="mkdir -p"
.include "../../mk/bsd.prefs.mk"
diff -r 57733e1b90e9 -r 0a828ec84edf net/netbsd-tap/options.mk
--- a/net/netbsd-tap/options.mk Fri Jul 21 14:27:53 2006 +0000
+++ b/net/netbsd-tap/options.mk Fri Jul 21 14:27:56 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2005/05/31 10:01:39 dillo Exp $
+# $NetBSD: options.mk,v 1.4 2006/07/21 14:27:56 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.netbsd-tap
PKG_SUPPORTED_OPTIONS= bpf
@@ -7,7 +7,7 @@
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mbpf)
-BUILD_ENV+= USE_BPF=YES
+PKGSRC_MAKE_ENV+= USE_BPF=YES
.endif
Home |
Main Index |
Thread Index |
Old Index