Attachment 124958 Details for Bug 168480 – patch-bsd.port.mk.sanity-config.txt

[patch] patch-bsd.port.mk.sanity-config.txt

patch-bsd.port.mk.sanity-config.txt (text/plain), 1.35 KB, created by Bryan Drewery on 2012-05-31 02:30:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bryan Drewery

Created: 2012-05-31 02:30:03 UTC

Size: 1.35 KB

patch

obsolete

>diff --git bsd.port.mk bsd.port.mk
>index 4280d38..599c590 100644
>--- bsd.port.mk
>+++ bsd.port.mk
>@@ -5980,18 +5980,39 @@ OPTIONS_WRONG_MULTI+=	${opt}
> .undef opt
> .endif #pre-check-config
> 
>-.if !target(check-config)
>-check-config: pre-check-config
>+.if !target(_check-config)
>+_check-config: pre-check-config
> .for multi in ${OPTIONS_WRONG_MULTI}
> 	@${ECHO_MSG} "====> You must check at least one option in the ${multi} multi"
>-	@exit 1
> .endfor
> .for single in ${OPTIONS_WRONG_SINGLE}
> 	@${ECHO_MSG} "====> You must select one and only one option from the ${single} single"
>-	@exit 1
> .endfor
>+.if !empty(OPTIONS_WRONG_MULTI) || !empty(OPTIONS_WRONG_SINGLE)
>+_CHECK_CONFIG_ERROR=	true
>+.endif
>+.endif # _check-config
>+
>+.if !target(check-config)
>+check-config: _check-config
>+.if !empty(_CHECK_CONFIG_ERROR)
>+	@exit 1
>+.endif
> .endif # check-config
> 
>+.if !target(sanity-config)
>+sanity-config: _check-config
>+.if !empty(_CHECK_CONFIG_ERROR)
>+	@echo -n "Config is invalid. Re-edit? [Y/N] "; \
>+	read answer; \
>+	case $$answer in \
>+	[Nn]|[Nn][Oo]) \
>+		exit 0; \
>+	esac; \
>+	${MAKE} config
>+.endif
>+.endif # sanity-config
>+
> .if !target(pre-config)
> pre-config:
> _COMPLETE_OPTIONS_LIST:=	${ALL_OPTIONS}
>@@ -6079,6 +6100,7 @@ config: pre-config
> 		${CAT} $${TMPOPTIONSFILE} > ${OPTIONSFILE}; \
> 	fi; \
> 	${RM} -f $${TMPOPTIONSFILE}
>+	@${MAKE} sanity-config
> .endif
> .endif # config

Actions: View | Diff

Attachments on bug 168480: 124958