Page MenuHomeFreeBSD
Differential D29353

Mk/Uses/ninja.mk: add support for devel/samurai
AbandonedPublic
Actions

Authored by tobik on Mar 20 2021, 5:55 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Jul 4, 7:18 AM
Unknown Object (File)
Sun, Jun 28, 11:55 PM
Unknown Object (File)
Wed, Jun 24, 10:24 PM
Unknown Object (File)
Wed, Jun 24, 11:47 AM
Unknown Object (File)
Mon, Jun 22, 8:26 PM
Unknown Object (File)
Sat, Jun 20, 9:54 PM
Unknown Object (File)
Sat, Jun 20, 6:22 PM
Unknown Object (File)
Sat, Jun 20, 11:01 AM
View All Files
Subscribers
bapt
mat

Details

Reviewers
None
Group Reviewers
O5: Ports Framework(Owns No Changed Paths)
portmgr
Summary

Current version of Samurai is compatible with Ninja 1.9.0. It has fewer dependencies and is a simpler implementation than Ninja. Alpine Linux uses Samurai instead of Ninja (see [0] for the original proposal about this). CMake and Meson have native support for it nowadays. This does the rest and hooks it up to the framework to make it trivial to experiment with it. OpenBSD Ports has a similar USE_NINJA=samurai knob for this but only for cmake-based ports.

[0] https://lists.alpinelinux.org/~alpine/devel/%3CBYZDB5LH4OVY.9FDVF5I3J954%40homura%3E

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 38399
Build 35288: arc lint + arc unit

Event Timeline

tobik created this revision.Mar 20 2021, 5:55 PM
tobik held this revision as a draft.
Owners added a reviewer: O5: Ports Framework.Mar 20 2021, 5:55 PM
Herald added a reviewer: portmgr. · View Herald TranscriptMar 20 2021, 5:55 PM
Herald added a subscriber: mat. · View Herald Transcript
Harbormaster completed remote builds in B37965: Diff 86083.Mar 20 2021, 5:55 PM
tobik edited the summary of this revision. (Show Details)Mar 22 2021, 10:00 AM
tobik published this revision for review.Mar 22 2021, 10:09 AM
bapt added a subscriber: bapt.Mar 22 2021, 1:57 PM

I do like it, I would be interested in a exp-run with both to see if there is any difference, I bet ninja vs samurai itself won't bring anything, but the fact we don't need python do build samurai, will make project using ninja (well samurai here ;)) appear earlier in the build process which may have an impact.

tobik updated this revision to Diff 86608.Mar 31 2021, 12:43 PM
  • Rebase
Harbormaster completed remote builds in B38211: Diff 86608.Mar 31 2021, 12:43 PM
tobik updated this revision to Diff 86609.Mar 31 2021, 12:46 PM
  • Include newly added sysutils/fluxengine
Harbormaster completed remote builds in B38212: Diff 86609.Mar 31 2021, 12:46 PM
tobik updated this revision to Diff 86610.Mar 31 2021, 12:58 PM
  • sysutils/fluxengine generates broken Ninja files; fix that
Harbormaster completed remote builds in B38213: Diff 86610.Mar 31 2021, 12:58 PM
tobik updated this revision to Diff 86616.EditedMar 31 2021, 1:20 PM
  • export SAMUFLAGS to make samu builds respect MAKE_JOBS_NUMBER

Apparently ninja defaults to running things in parallel, but samu does not.
Edit: hmm, no I think I'm wrong here, but SAMUFLAGS should be set regardless since some ports (for example, sysutils/fluxengine) just call ninja without any args and do not respect MAKE_JOBS_NUMBER without it.

Harbormaster completed remote builds in B38214: Diff 86616.Mar 31 2021, 1:20 PM
tobik updated this revision to Diff 86618.Mar 31 2021, 1:28 PM
  • Also pass -v in SAMUFLAGS for ports that call ninja on their own and ignore MAKE_ARGS
Harbormaster completed remote builds in B38215: Diff 86618.Mar 31 2021, 1:28 PM
tobik added a comment.Mar 31 2021, 1:31 PM
In D29353#657807, @bapt wrote:

I do like it, I would be interested in a exp-run with both to see if there is any difference, I bet ninja vs samurai itself won't bring anything, but the fact we don't need python do build samurai, will make project using ninja (well samurai here ;)) appear earlier in the build process which may have an impact.

Asked for an exp-run here: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=254678

tobik updated this revision to Diff 86794.Apr 3 2021, 8:26 PM
  • Unbreak ninja:run
Harbormaster completed remote builds in B38299: Diff 86794.Apr 3 2021, 8:26 PM
tobik updated this revision to Diff 86804.Apr 4 2021, 8:33 AM
  • Add fix for floating point exception bug with NINJA_STATUS=%p
Harbormaster completed remote builds in B38305: Diff 86804.Apr 4 2021, 8:34 AM
tobik updated this revision to Diff 86805.Apr 4 2021, 8:36 AM
  • Update review from the right branch...
Harbormaster completed remote builds in B38306: Diff 86805.Apr 4 2021, 8:36 AM
tobik updated this revision to Diff 86806.Apr 4 2021, 9:41 AM
  • Update devel/samurai to latest master with upstream fix for the fpe bug
Harbormaster completed remote builds in B38307: Diff 86806.Apr 4 2021, 9:41 AM
tobik updated this revision to Diff 86829.Apr 5 2021, 6:28 AM
  • Fix x11-wm/mutter build order bug with patch from Aports
  • Fix x11/brisk-menu build order bug
  • Add missing USES=python:build to some ports that got it through ninja previously
  • Fix lang/swi-pl build by adding missing USES=readline (previously implicit through ninja->python->readline)
  • Only append -v to MAKE_ARGS when using ninja. samu already gets it via SAMUFLAGS. ninja supports GNU-style arguments (flags in any order) while samu does not and -v gets added last. This should fix the immediate error in www/chromium (build goes further but complete build untested)
Harbormaster completed remote builds in B38319: Diff 86829.Apr 5 2021, 6:28 AM
tobik updated this revision to Diff 86836.Apr 5 2021, 12:48 PM
  • More missing USES=python:build fixes
  • Add explicit USES=ninja:build to multimedia/handbrake (previously got it through meson but now needs the samu alias)
  • Attempt to fix build order bug in x11-fonts/font-manager
Harbormaster completed remote builds in B38323: Diff 86836.Apr 5 2021, 12:48 PM
tobik updated this revision to Diff 86944.Apr 7 2021, 6:08 AM
  • Rebase
  • Try to unbreak www/deno (untested)
Harbormaster completed remote builds in B38379: Diff 86944.Apr 7 2021, 6:08 AM
tobik updated this revision to Diff 87007.Apr 8 2021, 9:34 AM
  • devel/meson, Mk/Uses/meson.mk: Do not force color output

By default Meson forces color output. Ninja strips the escape
sequences before they go into the log. Samurai does not do that,
so we end up with some garbage in the logs. Pass -Db_colorout=never
to Meson to disable colors in general. Also see
https://mesonbuild.com/Builtin-options.html

This requires a small backport in devel/meson since the b_colorout
option is broken with Clang at the moment.

Harbormaster completed remote builds in B38399: Diff 87007.Apr 8 2021, 9:34 AM
tobik updated this revision to Diff 87178.Apr 10 2021, 7:42 AM
  • Rebase
Harbormaster completed remote builds in B38477: Diff 87178.Apr 10 2021, 7:43 AM
tobik mentioned this in R11:a91d65363fe8: Mk/Uses/ninja.mk: Add support for devel/samurai (D29353).Apr 20 2021, 7:00 AM
tobik mentioned this in R11:ff2796d5bc83: Mk/Uses/meson.mk: Do not force color output (D29353).
tobik abandoned this revision.Apr 20 2021, 7:03 AM

Committed.

Any further comments can happen in https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=254678

Revision Contents
Changeset List

PathSize
Mk/
Uses/
5 lines
61 lines
4 lines
deskutils/
bijiben/
files/
14 lines
devel/
jiri/
5 lines
meson/
4 lines
files/
24 lines
tinygo/
5 lines
graphics/
py-h3/
3 lines
japanese/
mozc-server/
7 lines
lang/
mono6.8/
2 lines
rust-bootstrap/
3 lines
rust/
5 lines
math/
py-pdal/
5 lines
sage/
8 lines
multimedia/
handbrake/
4 lines
sysutils/
fluxengine/
4 lines
www/
deno/
4 lines
qt5-webengine/
3 lines

Diff 87007

View Options

Mk/Uses/meson.mk

Loading...
View Options

Mk/Uses/ninja.mk

Loading...
View Options

Mk/bsd.default-versions.mk

Loading...
View Options

deskutils/bijiben/files/patch-src_libbiji_meson.build

Loading...
View Options

devel/jiri/Makefile

Loading...
View Options

devel/meson/Makefile

Loading...
View Options

devel/meson/files/patch-mesonbuild_compilers_mixins_clang.py

Loading...
View Options

devel/tinygo/Makefile

Loading...
View Options

graphics/py-h3/Makefile

Loading...
View Options

japanese/mozc-server/Makefile

Loading...
View Options

lang/mono6.8/Makefile

Loading...
View Options

lang/rust-bootstrap/Makefile

Loading...
View Options

lang/rust/Makefile

Loading...
View Options

math/py-pdal/Makefile

Loading...
View Options

math/sage/Makefile

Loading...
View Options

multimedia/handbrake/Makefile

Loading...
View Options

sysutils/fluxengine/Makefile

Loading...
View Options

www/deno/Makefile

Loading...
View Options

www/qt5-webengine/Makefile

Loading...