config: add COREENV override for differing setups

Makefile

@@ -79,6 +79,7 @@ PORTSDIR?=	/usr/ports
 PORTSBRANCH?=	master
 COREDIR?=	/usr/core
 COREBRANCH?=	master
+COREENV?=	#CORE_PHP=71
 SRCDIR?=	/usr/src
 SRCBRANCH?=	master
 
@@ -123,5 +124,6 @@ ${STEP}: lint
 	    -m ${MIRRORS:Ox:[1]} -o "${STAGEDIRPREFIX}" -c ${SPEED} \
 	    -b ${SRCBRANCH} -B ${PORTSBRANCH} -e ${PLUGINSBRANCH} \
 	    -g ${TOOLSBRANCH} -E ${COREBRANCH} -G ${PORTSREFBRANCH} \
-	    -u "${UEFI:tl}" -U "${SUFFIX}" -V "${ADDITIONS}" ${${STEP}_ARGS}
+	    -H "${COREENV}" -u "${UEFI:tl}" -U "${SUFFIX}" -V "${ADDITIONS}" \
+	    ${${STEP}_ARGS}
 .endfor

build/common.sh

@@ -28,7 +28,7 @@
 
 set -e
 
-OPTS="a:B:b:C:c:d:E:e:F:f:G:g:K:k:L:l:m:n:o:P:p:R:S:s:T:t:U:u:v:V:"
+OPTS="a:B:b:C:c:d:E:e:F:f:G:g:H:K:k:L:l:m:n:o:P:p:R:S:s:T:t:U:u:v:V:"
 
 while getopts ${OPTS} OPT; do
 	case ${OPT} in
@@ -70,6 +70,9 @@ while getopts ${OPTS} OPT; do
 	g)
 		export TOOLSBRANCH=${OPTARG}
 		;;
+	H)
+		export COREENV=${OPTARG}
+		;;
 	K)
 		if [ -n "${OPTARG}" ]; then
 			export PRODUCT_PUBKEY=${OPTARG}

build/core.sh

@@ -47,7 +47,7 @@ for BRANCH in master ${COREBRANCH}; do
 	setup_copy ${STAGEDIR} ${COREDIR}
 	git_reset ${STAGEDIR}${COREDIR} ${BRANCH}
 
-	CORE_ARGS="CORE_ARCH=${PRODUCT_ARCH}"
+	CORE_ARGS="CORE_ARCH=${PRODUCT_ARCH} ${COREENV}"
 
 	CORE_NAME=$(make -C ${STAGEDIR}${COREDIR} ${CORE_ARGS} name)
 	CORE_DEPS=$(make -C ${STAGEDIR}${COREDIR} ${CORE_ARGS} depends)

config/17.7/build.conf

@@ -1,3 +1,5 @@
 #PLUGINSBRANCH?=	stable/17.7
 #COREBRANCH?=	stable/17.7
 #SRCBRANCH?=	stable/17.7
+
+COREENV?=	CORE_PHP=71 CORE_ABI=17.7