cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

go back partially on SUBST_CMD: keep the SUBST_CMD-sub stuff, but

Browse Source 
have a "default" SUBST_CMD that will substitute the non-subpackage version
of the variables.

SUBST_CMD = ${SUBST_CMD${SUBPACKAGE}}
is a bad idea, because SUBPACKAGE may vary in unexpected ways, like you
get the 'default' value when building manually, and you might get a
different subpackage when building with dpb, leading to weird errors.

So, old users/users during patch/configure/build can use base SUBST_CMD
without much surprise.
This commit is contained in:
espie 2012-08-31 16:48:26 +00:00
parent 4b7ad2646b
commit 5429993fd7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
infrastructure/mk/bsd.port.mk
View File

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.1187 2012/08/19 22:30:36 ajacoutot Exp $
# $OpenBSD: bsd.port.mk,v 1.1188 2012/08/31 16:48:26 espie Exp $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain.
@ -906,7 +906,11 @@ PKG_ARGS${_S} += -DEPOCH=${EPOCH${_S}}
SUBST_CMD${_S} = ${_PERLSCRIPT}/pkg_subst ${_substvars${_S}}
.endfor
SUBST_CMD = ${SUBST_CMD${SUBPACKAGE}}
SUBST_CMD = ${_PERLSCRIPT}/pkg_subst
.for _v in ${SUBST_VARS}
SUBST_CMD += -D${_v}=${${_v:S/^^//}:Q}
.endfor
# XXX
.if ${MULTI_PACKAGES} == "-"