diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2018-06-22 06:44:44 +0000 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2018-06-22 06:44:44 +0000 |
| commit | 6f1399c349eb50580b3165ea6435c8fa3df10a65 (patch) | |
| tree | b24de2570bee44c3754e1889555a6efe67e97792 | |
| parent | Add devel/p5-Signal-Mask (diff) | |
Fix building of specific qt4 ports after qt5 has become the default flavor.
The ports infrastructure does not consistently deal with FLAVOR environment
variables set to an empty string. This caused the dependency check in
portmaster to fail for multimedia/phonon.
With FLAVOR="" in the environment, "make -V FLAVOR" returns "qt4", but the
dependency list produced by "make build-depends-list" assumes "qt5", even
though no user preferences for qt5 have been set.
Reported by: Walter Schwarzenfeld <w.schwarzenfeld at utanet.at>
Approved by: antoine (implicit)
| -rw-r--r-- | ports-mgmt/portmaster/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portmaster/files/patch-portmaster | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile index 12c0bbcdba99..b8e31d33e2ca 100644 --- a/ports-mgmt/portmaster/Makefile +++ b/ports-mgmt/portmaster/Makefile @@ -2,7 +2,7 @@ PORTNAME= portmaster PORTVERSION= 3.19 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= ports-mgmt MAINTAINER= se@FreeBSD.org diff --git a/ports-mgmt/portmaster/files/patch-portmaster b/ports-mgmt/portmaster/files/patch-portmaster index 017b55826ff0..33e7bec237a5 100644 --- a/ports-mgmt/portmaster/files/patch-portmaster +++ b/ports-mgmt/portmaster/files/patch-portmaster @@ -53,7 +53,7 @@ +target_part () { [ -z "${1##*:*}" ] && echo "${1#*:}" || echo install; } +flavor_part () { local tmp="${1%%:*}"; [ -z "${tmp##*@*}" ] && echo "${tmp#*@}"; } +dir_part () { local tmp="${1%%:*}"; echo "${tmp%%@*}"; } -+export_flavor () { [ "$FLAVOR" != "$1" ] && export FLAVOR="$1"; } ++export_flavor () { if [ -n "$1" ]; then export FLAVOR="$1"; else unset FLAVOR; fi; } + pm_cd () { builtin cd $1 2>/dev/null || return 1; } pm_cd_pd () { [ -n "$PM_INDEX_ONLY" ] && return 2; @@ -459,18 +459,19 @@ $PM_SU_CMD /etc/rc.d/ldconfig start > /dev/null fi unset temp file files -@@ -3876,9 +3911,12 @@ if [ -n "$MAKE_PACKAGE" ]; then +@@ -3876,9 +3911,13 @@ if [ -n "$MAKE_PACKAGE" ]; then fi if [ -z "$use_package" -a -z "$DONT_POST_CLEAN" ]; then -# export_flavor $(flavor_part $portdir) ++ flavor=$(flavor_part $portdir) + for dir in $post_clean_l; do + pm_v "===>>> Running 'make clean' for special build dependency $dir" -+ (FLAVOR=$(flavor_part $portdir) pm_make_s -C "$pd/$dir" clean NOCLEANDEPENDS=ncd2 >/dev/null)& ++ (pm_make_s -C "$pd/$dir" "${flavor:+FLAVOR=$flavor}" clean NOCLEANDEPENDS=ncd2 >/dev/null)& + done pm_v "===>>> Running 'make clean' in the background" - (pm_make_s clean NOCLEANDEPENDS=ncd2 >/dev/null)& -+ (FLAVOR=$(flavor_part $portdir) pm_make_s clean NOCLEANDEPENDS=ncd2 >/dev/null)& ++ (pm_make_s "${flavor:+FLAVOR=$flavor}" clean NOCLEANDEPENDS=ncd2 >/dev/null)& pm_v fi if [ -n "$ro_opd" ]; then |