Page MenuHomeFreeBSD

Some more basic flavors work.
ClosedPublic

Authored by mat on Oct 3 2017, 4:47 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Dec 12, 6:49 PM
Unknown Object (File)
Thu, Dec 12, 6:44 AM
Unknown Object (File)
Thu, Dec 12, 2:41 AM
Unknown Object (File)
Wed, Dec 4, 3:21 PM
Unknown Object (File)
Sun, Dec 1, 12:48 AM
Unknown Object (File)
Nov 21 2024, 10:55 PM
Unknown Object (File)
Oct 29 2024, 9:51 PM
Unknown Object (File)
Oct 26 2024, 6:00 PM

Details

Reviewers
bapt
bdrewery
Group Reviewers
portmgr
Commits
rP455205: Generic FLAVORS work.

Diff Detail

Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 12334
Build 12622: arc lint + arc unit

Event Timeline

There are a very large number of changes, so older changes are hidden. Show Older Changes
  • Move the flavors sanity checks a bit later.
This revision is now accepted and ready to land.Oct 4 2017, 1:50 PM
  • Add a target showing the different package names of a port.
This revision now requires review to proceed.Oct 12 2017, 5:07 PM
  • Add a non pretty target to be used in qa checks.
  • Add a qa check for unique package names amongst flavors.

Its output is something like:

Error: Package names are not uniques with flavors:
python2: b2-0.7.2
python3: b2-0.7.2
Error: maybe use <flavor>_PKGNAMEPREFIX/SUFFIX.
This revision is now accepted and ready to land.Oct 13 2017, 2:41 PM
  • Make MOVEDlint understand flavors.
This revision now requires review to proceed.Oct 18 2017, 1:12 PM
  • Be a bit more verbose about which FLAVOR is defined when none should be.
  • Fix fetch-specials when flavors are in play.
  • fix make clean FLAVOR=xxx
  • Add a bit of sanity check to make sure FLAVORS stay lowercase.

rebase after MOVEDlint update.

Mk/bsd.port.mk
1461

So, this works just fine on FreeBSD 11.x, but does not work at all on FreeBSD 10.3.

Any ideas on how I can make this work ?

  • Make the bad FLAVORS name work on 10.
  • Add support for flavors in the from field.
  • Add a tentative CHANGES entry.
  • Forbid using "all" as a flavor name.
allanjude added inline comments.
CHANGES
16 ↗(On Diff #35192)

Flavors are a way to have multiple variants of a port.

mat marked an inline comment as done.Nov 24 2017, 1:04 PM
  • fixup! Add a tentative CHANGES entry.
bdrewery added a subscriber: bdrewery.
bdrewery added inline comments.
CHANGES
25 ↗(On Diff #35687)

"pass the FLAVOR as an argument after make". Your example is not environment, and as far as I can tell it is safer to use it as an argument rather than as environment anyway.

16 ↗(On Diff #35192)

I don't think we should use the word 'variant' anywhere as then people ask "Why not call them variants?? I will just do that anyway". And there is prior art for "variant" in macports which seems to be analogous to our OPTIONS and not FLAVORS.

Mk/bsd.port.mk
1462

Perfect, thanks!

4345

Is DESCRIBE_FLAVORED intended to be DESCRIBE_FLAVORS here and below? The phrase "describe flavored" doesn't make sense to me :)

4364

Pass FLAVOR as a make argument please

4648

.PHONY

4654

Pass FLAVOR as a make argument please

4658

.PHONY

4663

Pass FLAVOR as a make argument please

This revision now requires changes to proceed.Nov 28 2017, 11:47 PM
mat marked 2 inline comments as done.Nov 29 2017, 11:30 AM
mat added inline comments.
CHANGES
16 ↗(On Diff #35192)

I am at a loss of synonyms, what would you want me to use ? I can't use flavor again because I cannot define some word with itself, "version" would be bad...

Mk/bsd.port.mk
4345

It may be frenglish :-)
Maybe it should have been FLAVORED_DESCRIBE.

4364

It is passed as a make argument, is it not ?

4648

I guess many many targets are missing .PHONY here, no ?

4654

It is a make argument, isn't it ?

4663

it is, no ?

adamw added inline comments.
CHANGES
18 ↗(On Diff #35949)

to the flavors

32 ↗(On Diff #35949)

Be sure to guard against an empty FLAVOR variable by using ${FLAVOR:U}:

16 ↗(On Diff #35192)

I'm not sure that "variant" will be confused for OPTIONS, because we've been pretty clear on what OPTIONS are in FreeBSD for many years.

But if not variants: configurations, variations, forms, arrangements.

mat marked 5 inline comments as done.Nov 29 2017, 1:57 PM

DESCRIBE_FLAVORED is still weird but otherwise ship it.

Mk/bsd.port.mk
4345

maybe DESCRIBED_FLAVOR ?

4364

oops

This revision is now accepted and ready to land.Nov 29 2017, 10:31 PM
This revision was automatically updated to reflect the committed changes.