Differential D13756

Fix flavor helpers when only bsd.port.pre.mk is not used and FLAVOR is not set.
ClosedPublic
Actions

Authored by bdrewery on Jan 3 2018, 11:27 PM.

Details

Reviewers

None

Group Reviewers

portmgr

Commits

rP458395: MFH: r458394
rP458394: Fix flavor helpers when only bsd.port.pre.mk is not used and FLAVOR is not set.

Summary

The helpers were being evaluated before the default FLAVOR was set. The
helpers worked fine if the FLAVOR was specified by the user but not if
it was left to the default value. Resolve this by moving the helpers
right after the default FLAVOR is set.

PR: 224879

Test Plan

In some random Makefile:

FLAVORS= foo bar
foo_RUN_DEPENDS= blah>=0:devel/blah

Then run:

make -V RUN_DEPENDS
make -V RUN_DEPENDS FLAVOR=foo
make -V RUN_DEPENDS FLAVOR=bar

Diff Detail

Repository

rP FreeBSD ports repository

Lint

No Lint Coverage

Unit

No Test Coverage

Build Status

Buildable 14097
Build 14275: arc lint + arc unit

Event Timeline

bdrewery created this revision.Jan 3 2018, 11:27 PM

Herald added 1 blocking reviewer(s): portmgr. · View Herald TranscriptJan 3 2018, 11:27 PM

Herald added a subscriber: mat. · View Herald Transcript

bdrewery edited the summary of this revision. (Show Details)Jan 3 2018, 11:29 PM

This revision was not accepted when it landed; it landed in state Needs Review.Jan 8 2018, 12:24 AM

Closed by commit rP458394: Fix flavor helpers when only bsd.port.pre.mk is not used and FLAVOR is not set. (authored by bdrewery). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

Mk/

bsd.port.mk

57 lines

Diff 37487

View Options

Fix flavor helpers when only bsd.port.pre.mk is not used and FLAVOR is not set.ClosedPublicActions