Attachment 247153 Details for Bug 237290 – patch for 15-CURRENT

[patch] patch for 15-CURRENT

ports-modules-handle-flavors.diff (text/plain), 1.30 KB, created by Alastair Hogge on 2023-12-19 08:26:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alastair Hogge

Created: 2023-12-19 08:26:42 UTC

Size: 1.30 KB

patch

obsolete

>diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
>index d2968b42f5ef..8773d265dabb 100644
>--- a/sys/conf/kern.post.mk
>+++ b/sys/conf/kern.post.mk
>@@ -116,7 +116,7 @@ PORTSMODULESENV=\
> 	-u MAKESYSPATH \
> 	-u MK_AUTO_OBJ \
> 	-u MAKEOBJDIR \
>-	MAKEFLAGS="${MAKEFLAGS:M*:tW:S/^-m /-m_/g:S/ -m / -m_/g:tw:N-m_*:NMK_AUTO_OBJ=*}" \
>+	MAKEFLAGS="${MAKEFLAGS:M*:C/((^| )-[Jjm]) /\1/gW:N-[Jjm]*:NMK_AUTO_OBJ=*}" \
> 	SYSDIR=${SYSDIR} \
> 	PATH=${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin \
> 	SRC_BASE=${SRC_BASE} \
>@@ -128,7 +128,7 @@ PORTSMODULESENV=\
> all:
> .for __i in ${PORTS_MODULES}
> 	@${ECHO} "===> Ports module ${__i} (all)"
>-	cd ${PORTSDIR:U/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B clean build
>+	cd $${PORTSDIR:-/usr/ports}/${__i:C/@[^@]*$//}; ${PORTSMODULESENV} ${MAKE} ${__i:M*@*:C/^.*@/FLAVOR=/:Q} clean build
> .endfor
> 
> .for __target in install reinstall clean
>@@ -136,7 +136,7 @@ ${__target}: ports-${__target}
> ports-${__target}:
> .for __i in ${PORTS_MODULES}
> 	@${ECHO} "===> Ports module ${__i} (${__target})"
>-	cd ${PORTSDIR:U/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B ${__target:C/(re)?install/deinstall reinstall/}
>+	cd $${PORTSDIR:-/usr/ports}/${__i:C/@[^@]*$//}; ${PORTSMODULESENV} ${MAKE} ${__i:M*@*:C/^.*@/FLAVOR=/:Q} ${__target:C/(re)?install/deinstall reinstall/}
> .endfor
> .endfor
> .endif

Actions: View | Diff

Attachments on bug 237290: 203705 | 203755 | 205980 | 234277 | 234307 | 247153 | 247166 | 252906