Bug 254678 - Mk/Uses/ninja.mk: Add support for devel/samurai
Summary: Mk/Uses/ninja.mk: Add support for devel/samurai
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Ports Framework (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Port Management Team
URL: https://reviews.freebsd.org/D29353
Keywords:
Depends on:
Blocks:
 
Reported: 2021-03-31 13:29 UTC by Tobias Kortkamp
Modified: 2021-06-04 09:17 UTC (History)
1 user (show)

See Also:
tobik: exp-run?


Attachments
v0 (12.47 KB, patch)
2021-03-31 13:29 UTC, Tobias Kortkamp
no flags Details | Diff
v1 (12.49 KB, patch)
2021-04-03 20:28 UTC, Tobias Kortkamp
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Tobias Kortkamp freebsd_committer freebsd_triage 2021-03-31 13:29:59 UTC
Created attachment 223729 [details]
v0

As suggested by bapt in the review, please do an exp-run with
DEFAULT_VERSIONS+=ninja=samurai and ninja=ninja to uncover any build
problems when using samurai and to find out if using it impacts the
build in any positive way.  Thank you.
Comment 1 Antoine Brodin freebsd_committer freebsd_triage 2021-04-03 17:40:23 UTC
devel/meson fails to configure:

http://package18.nyi.freebsd.org/data/122amd64-default-foo/2021-04-03_16h36m21s/logs/meson-0.57.1.log
Comment 2 Tobias Kortkamp freebsd_committer freebsd_triage 2021-04-03 20:28:04 UTC
Created attachment 223791 [details]
v1

- Unbreak ninja:run
Comment 3 Tobias Kortkamp freebsd_committer freebsd_triage 2021-04-04 08:32:24 UTC
Some ports fail to build with a floating point exception. This is caused
by a bug in samurai with NINJA_STATUS=%p. I reported it upstream:
https://github.com/michaelforney/samurai/pull/69
Comment 4 commit-hook freebsd_committer freebsd_triage 2021-04-07 04:21:54 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1699e4b153cd862122d547ced63795f97e178853

commit 1699e4b153cd862122d547ced63795f97e178853
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-06 07:24:25 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-07 04:20:01 +0000

    x11/cinnamon: Attempt to fix build order bug (D29353)

    Uncovered while building with devel/samurai but can probably also
    happen with ninja eventually.

    In file included from ../src/main.c:25:
    In file included from ../src/cinnamon-global-private.h:28:
    In file included from src/st/st.h:7:
    ../src/st/st-box-layout-child.h:24:10: fatal error: 'st-enum-types.h' file not found
     #include "st-enum-types.h"
             ^~~~~~~~~~~~~~~~~
    1 error generated.
    samu: subcommands failed

    http://package18.nyi.freebsd.org/data/122amd64-default-foo/2021-04-05_21h03m50s/logs/errors/cinnamon-4.8.6.log

    PR:             254678

 x11/cinnamon/files/patch-src_st_meson.build (new) | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
Comment 5 commit-hook freebsd_committer freebsd_triage 2021-04-07 04:21:55 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ebb0dd9648ac31174980ee73d160315d81f94478

commit ebb0dd9648ac31174980ee73d160315d81f94478
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-07 03:39:05 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-07 04:19:58 +0000

    x11-fonts/font-manager: Attempt to fix build order bug (D29353)

    Uncovered while building with devel/samurai but can probably also
    happen with ninja eventually.

    error: Package `Unicode-0.8.5' not found in specified Vala API directories or GObject-Introspection GIR directories
    samu: subcommand failed

    http://package23.nyi.freebsd.org/data/114i386-default-foo/2021-04-04_07h39m29s/logs/errors/font-manager-0.8.5.log

    While here also remove explicit ninja dependency.  It is already
    pulled in through meson.

    PR:             254678
    Obtained from:  upstream

 x11-fonts/font-manager/Makefile                    |  1 -
 .../files/patch-lib_common_meson.build (new)       | 23 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
Comment 6 commit-hook freebsd_committer freebsd_triage 2021-04-07 04:21:56 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cc57c3d5cf115fcc2b155ea36dd8763b31973a21

commit cc57c3d5cf115fcc2b155ea36dd8763b31973a21
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-07 03:29:37 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-07 04:19:56 +0000

    math/flint2: Add explicit Python build dependency (D29353)

    This unbreaks the build when using devel/samurai.

    It previously got it through ninja which has a run dependency on
    Python.

    CMake Error at /usr/local/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:218 (message):
      Could NOT find PythonInterp (missing: PYTHON_EXECUTABLE)
    Call Stack (most recent call first):
      /usr/local/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:582 (_FPHSA_FAILURE_MESSAGE)
      /usr/local/share/cmake/Modules/FindPythonInterp.cmake:169 (FIND_PACKAGE_HANDLE_STANDARD_ARGS)
      CMakeLists.txt:37 (find_package)

    http://package18.nyi.freebsd.org/data/122amd64-default-foo/2021-04-04_07h37m38s/logs/errors/flint2-2.7.1.log

    PR:             254678

 math/flint2/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Comment 7 commit-hook freebsd_committer freebsd_triage 2021-04-07 04:21:57 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=01979e78f8f420c88d501066277fa4a7778e8fa1

commit 01979e78f8f420c88d501066277fa4a7778e8fa1
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-07 03:34:27 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-07 04:19:58 +0000

    lang/swi-pl: Add explicit readline dependency (D29353)

    This unbreaks the build when using devel/samurai.

    It previously got it through ninja->python->readline.

    ===>  Building package for swi-pl-8.2.3_1
    pkg-static: Unable to access file /wrkdirs/usr/ports/lang/swi-pl/work/stage/usr/local/lib/swipl/doc/packages/readline.html:No such file or directory
    pkg-static: Unable to access file /wrkdirs/usr/ports/lang/swi-pl/work/stage/usr/local/lib/swipl/lib/amd64-freebsd/readline4pl.so:No such file or directory
    pkg-static: Unable to access file /wrkdirs/usr/ports/lang/swi-pl/work/stage/usr/local/lib/swipl/library/readline.pl:No such file or directory
    *** Error code 1

    http://package18.nyi.freebsd.org/data/122amd64-default-foo/2021-04-04_07h37m38s/logs/errors/swi-pl-8.2.3_1.log

    PR:             254678

 lang/swi-pl/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Comment 8 commit-hook freebsd_committer freebsd_triage 2021-04-07 04:21:58 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6428be4064828417c59ea99b98fa5ef404f70e25

commit 6428be4064828417c59ea99b98fa5ef404f70e25
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-07 03:48:51 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-07 04:20:00 +0000

    x11/brisk-menu: Attempt to fix build order bug (D29353)

    Uncovered while building with devel/samurai but can probably also
    happen with ninja eventually.

    In file included from ../src/mate-applet/applet.c:19:
    In file included from ../src/frontend/classic/classic-window.h:14:
    ../src/frontend/classic/../menu-private.h:18:10: fatal error: 'libsaver-glue.h' file not found
     #include "libsaver-glue.h"
             ^~~~~~~~~~~~~~~~~
    1 error generated.
    samu: subcommands failed

    http://package18.nyi.freebsd.org/data/122amd64-default-foo/2021-04-04_07h37m38s/logs/errors/brisk-menu-0.6.2.log

    PR:             254678

 x11/brisk-menu/files/patch-src_meson.build (new) | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
Comment 9 commit-hook freebsd_committer freebsd_triage 2021-04-07 04:21:59 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=157731dfea5228f4da2ab9188dad3351ee3eeec8

commit 157731dfea5228f4da2ab9188dad3351ee3eeec8
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-07 03:44:08 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-07 04:19:59 +0000

    x11-wm/mutter: Attempt to fix build order bug (D29353)

    Uncovered while building with devel/samurai but can probably also
    happen with ninja eventually.

    In file included from ../src/core/mutter.c:26:
    In file included from ../src/compositor/meta-plugin-manager.h:25:
    In file included from ../src/core/util-private.h:30:
    In file included from ../src/meta/util.h:29:
    In file included from ../src/meta/common.h:34:
    In file included from ../clutter/clutter/clutter.h:32:
    In file included from ../clutter/clutter/clutter-types.h:32:
    In file included from ../cogl/cogl/cogl.h:142:
    ../cogl/cogl-path/cogl-path.h:55:10: fatal error: 'cogl-path/cogl-path-enum-types.h' file not found
     #include <cogl-path/cogl-path-enum-types.h>
             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    1 error generated.
    samu: subcommands failed

    http://package18.nyi.freebsd.org/data/122amd64-default-foo/2021-04-04_07h37m38s/logs/errors/mutter-3.36.6.log

    PR:             254678
    Obtained from:  Aports

 .../files/patch-clutter_clutter_meson.build (new)  | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)
Comment 10 commit-hook freebsd_committer freebsd_triage 2021-04-07 04:22:00 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0f053e77c170f114b53f3ab793c668281e1a25a1

commit 0f053e77c170f114b53f3ab793c668281e1a25a1
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-07 03:31:00 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-07 04:19:56 +0000

    science/libecpint: Add explicit Python build dependency (D29353)

    This unbreaks the build when using devel/samurai.

    It previously got it through ninja which has a run dependency on
    Python.

    -- Could NOT find Python (missing: Python_EXECUTABLE Interpreter)
    CMake Error at src/CMakeLists.txt:22 (file):
      file failed to open for reading (No such file or directory):

        /wrkdirs/usr/ports/science/libecpint/work/.build/src/qlist.txt

    CMake Error at src/CMakeLists.txt:24 (add_custom_command):
      add_custom_command Wrong syntax.  A TARGET or OUTPUT must be specified.

    http://package18.nyi.freebsd.org/data/122amd64-default-foo/2021-04-04_07h37m38s/logs/errors/libecpint-1.0.5.log

    PR:             254678

 science/libecpint/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Comment 11 commit-hook freebsd_committer freebsd_triage 2021-04-07 04:22:01 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=742287c2f2dea420d57351f6db8a97ef88ee1c2c

commit 742287c2f2dea420d57351f6db8a97ef88ee1c2c
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-07 04:03:23 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-07 04:20:02 +0000

    devel/samurai: Update to 1.2-9-g27dde2e (D29353)

    This fixes a SIGFPE crash when there is nothing to do and
    NINJA_STATUS has %p

    PR:             254678

 devel/samurai/Makefile | 7 +++++--
 devel/samurai/distinfo | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)
Comment 12 commit-hook freebsd_committer freebsd_triage 2021-04-07 04:22:02 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7b1d905b03cc85d834d5cba7df8ab22f9f51e0ca

commit 7b1d905b03cc85d834d5cba7df8ab22f9f51e0ca
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-07 03:53:17 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-07 04:20:01 +0000

    sysutils/fluxengine: Unbreak build with devel/samurai (D29353)

    It does not like the extra whitespace which might be a bug in samurai
    but for now just remove it and fix the build.

    MKNINJA .obj/build.ninja
    ninja: .obj/build.ninja:6:5: expected name

    PR:             254678

 sysutils/fluxengine/files/patch-mkninja.sh (new) | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
Comment 13 commit-hook freebsd_committer freebsd_triage 2021-04-07 04:22:02 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e9c7d2b48706794ce8f5c582d0edd7913d20c3f3

commit e9c7d2b48706794ce8f5c582d0edd7913d20c3f3
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-07 03:27:57 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-07 04:19:55 +0000

    math/ambit: Add explicit Python build dependency (D29353)

    This unbreaks the build when using devel/samurai.

    It previously got it through ninja which has a run dependency on
    Python.

    CMake Error at /usr/local/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:218 (message):
      Could NOT find PythonInterp (missing: PYTHON_EXECUTABLE)
    Call Stack (most recent call first):
      /usr/local/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:582 (_FPHSA_FAILURE_MESSAGE)
      /usr/local/share/cmake/Modules/FindPythonInterp.cmake:169 (FIND_PACKAGE_HANDLE_STANDARD_ARGS)
      cmake/FindPythonLibsNew.cmake:59 (find_package)
      CMakeLists.txt:96 (find_package)

    http://package18.nyi.freebsd.org/data/122amd64-default-foo/2021-04-04_07h37m38s/logs/errors/ambit-tensor-0.5.1.log

    PR:             254678

 math/ambit/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Comment 14 commit-hook freebsd_committer freebsd_triage 2021-04-07 04:22:03 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=529b2c5b34cc7805642dafafa7e6ae6047fd4cc9

commit 529b2c5b34cc7805642dafafa7e6ae6047fd4cc9
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-07 03:19:21 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-07 04:19:51 +0000

    devel/pybind11: Add explicit Python build dependency (D29353)

    This unbreaks the build when using devel/samurai.

    It previously got it through ninja which has a run dependency on
    Python.

    CMake Error at /usr/local/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:218 (message):
      Could NOT find PythonInterp (missing: PYTHON_EXECUTABLE)
    Call Stack (most recent call first):
      /usr/local/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:582 (_FPHSA_FAILURE_MESSAGE)
      /usr/local/share/cmake/Modules/FindPythonInterp.cmake:169 (FIND_PACKAGE_HANDLE_STANDARD_ARGS)
      tools/FindPythonLibsNew.cmake:98 (find_package)
      tools/pybind11Tools.cmake:45 (find_package)
      tools/pybind11Common.cmake:201 (include)
      CMakeLists.txt:188 (include)

    http://package18.nyi.freebsd.org/data/122amd64-default-foo/2021-04-04_07h37m38s/logs/errors/pybind11-2.6.2.log

    PR:             254678

 devel/pybind11/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Comment 15 commit-hook freebsd_committer freebsd_triage 2021-04-07 04:22:04 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1930871df37d21d1c4773227c1b237b5682c1233

commit 1930871df37d21d1c4773227c1b237b5682c1233
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-07 03:23:35 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-07 04:19:52 +0000

    graphics/glad: Add explicit Python build dependency (D29353)

    This unbreaks the build when using devel/samurai.

    It previously got it through ninja which has a run dependency on
    Python.

    [  0% 1/3] cd /wrkdirs/usr/ports/graphics/glad/work/glad-0.1.34 && _Python_EXECUTABLE-NOTFOUND -m glad --profile=compatibility --out-path=/wrkdirs/usr/ports/graphics/glad/work/.build --api= --generator=c --extensions= --spec=gl --reproducible
    samu: job failed: cd /wrkdirs/usr/ports/graphics/glad/work/glad-0.1.34 && _Python_EXECUTABLE-NOTFOUND -m glad --profile=compatibility --out-path=/wrkdirs/usr/ports/graphics/glad/work/.build --api= --generator=c --extensions= --spec=gl --reproducible
    /bin/sh: _Python_EXECUTABLE-NOTFOUND: not found
    samu: subcommand failed

    http://package18.nyi.freebsd.org/data/122amd64-default-foo/2021-04-04_07h37m38s/logs/errors/glad-0.1.34.log

    PR:             254678

 graphics/glad/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Comment 16 commit-hook freebsd_committer freebsd_triage 2021-04-07 04:22:05 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=31bf1886ed9164c5cb36f6717fdb9f0f841d5c84

commit 31bf1886ed9164c5cb36f6717fdb9f0f841d5c84
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-07 03:25:10 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-07 04:19:54 +0000

    lang/hermes: Make Python an explicit build dependency (D29353)

    This unbreaks the build when using devel/samurai.

    It previously was available in the configure phase through ninja
    which has a run dependency on Python.

    =======================<phase: configure      >============================
    ===>  Missing "/usr/local/bin/python3.7" to create a binary alias at "/wrkdirs/usr/ports/lang/hermes/work/.bin/python"

    http://package18.nyi.freebsd.org/data/122amd64-default-foo/2021-04-04_07h37m38s/logs/errors/hermes-javascript-engine-0.7.2.20210322.log

    PR:             254678

 lang/hermes/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Comment 17 commit-hook freebsd_committer freebsd_triage 2021-04-07 04:22:06 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8769057caece8a9a11608f6cdafd7f4408b01193

commit 8769057caece8a9a11608f6cdafd7f4408b01193
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-07 03:13:43 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-07 04:19:50 +0000

    devel/catch: Add explicit Python build dependency (D29353)

    This unbreaks the build when using devel/samurai.  It previously
    got it through ninja which has a run dependency on Python.

    -- Could NOT find PythonInterp (missing: PYTHON_EXECUTABLE)
    CMake Error at CMakeLists.txt:50 (message):
      Python not found, but required for tests

    http://package18.nyi.freebsd.org/data/122amd64-default-foo/2021-04-04_07h37m38s/logs/errors/catch-2.13.3.log

    PR:             254678

 devel/catch/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Comment 18 commit-hook freebsd_committer freebsd_triage 2021-04-07 04:22:07 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1070c0706362da05bf2cc50bdaf348d2d5e8f81e

commit 1070c0706362da05bf2cc50bdaf348d2d5e8f81e
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-07 03:32:37 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-07 04:19:57 +0000

    textproc/uncrustify: Add explicit Python build dependency (D29353)

    This unbreaks the build when using devel/samurai.

    It previously got it through ninja which has a run dependency on
    Python.

    CMake Error at /usr/local/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:218 (message):
      Could NOT find PythonInterp (missing: PYTHON_EXECUTABLE)
    Call Stack (most recent call first):
      /usr/local/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:582 (_FPHSA_FAILURE_MESSAGE)
      /usr/local/share/cmake/Modules/FindPythonInterp.cmake:169 (FIND_PACKAGE_HANDLE_STANDARD_ARGS)
      CMakeLists.txt:20 (find_package)

    http://package18.nyi.freebsd.org/data/122amd64-default-foo/2021-04-04_07h37m38s/logs/errors/uncrustify-0.72.0.log

    PR:             254678

 textproc/uncrustify/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Comment 19 commit-hook freebsd_committer freebsd_triage 2021-04-07 04:22:08 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7789f5d26494c4d5288953042c1ebd98f422127c

commit 7789f5d26494c4d5288953042c1ebd98f422127c
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-07 03:21:24 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-07 04:19:51 +0000

    devel/tinygo: Add explicit Python build dependency (D29353)

    This unbreaks the build when using devel/samurai.

    It previously got it through ninja which has a run dependency on
    Python.

    -- Could NOT find PythonInterp (missing: PYTHON_EXECUTABLE)
    CMake Error at CMakeLists.txt:652 (message):
      Unable to find Python interpreter, required for builds and testing.

      Please install Python or specify the PYTHON_EXECUTABLE CMake variable.

    http://package18.nyi.freebsd.org/data/122amd64-default-foo/2021-04-04_07h37m38s/logs/errors/tinygo-0.14.1_1.log

    PR:             254678

 devel/tinygo/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Comment 21 commit-hook freebsd_committer freebsd_triage 2021-04-07 11:55:02 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5f925921c7fb2282b2673b38a4fafd4545fcbe1d

commit 5f925921c7fb2282b2673b38a4fafd4545fcbe1d
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-07 11:46:27 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-07 11:49:50 +0000

    x11-themes/gtk-arc-themes: Try to fix build order bug (D29353)

    Uncovered while building with devel/samurai but can probably also
    happen with ninja eventually.

    samu: job failed: /usr/local/bin/glib-compile-resources --sourcedir=common/gtk-3.0 --target=common/gtk-3.0/gtk-lighter.gresource common/gtk-3.0/gtk-lighter.gresource.xml
    common/gtk-3.0/gtk-lighter.gresource.xml: Failed to locate checkbox-checked.png

    http://package18.nyi.freebsd.org/data/122amd64-default-foo/2021-04-05_21h03m50s/logs/errors/gtk-arc-themes-20210127.log

    PR:             254678

 .../files/patch-common_gtk-3.0_meson.build (new)   | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)
Comment 22 commit-hook freebsd_committer freebsd_triage 2021-04-08 11:59:26 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d3a1e886a884a65b139547cd2ed8c8c0e639dfb1

commit d3a1e886a884a65b139547cd2ed8c8c0e639dfb1
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-08 11:56:57 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-08 11:58:58 +0000

    audio/muse-sequencer: Try to fix build order bug (D29353)

    Uncovered while building with devel/samurai but can probably also
    happen with ninja eventually.  There are some missing dependencies
    on the components module.

    In file included from /wrkdirs/usr/ports/audio/muse-sequencer/work/muse-muse_3_1_1/muse3/muse/waveedit/wavecanvas.cpp:72:
    /wrkdirs/usr/ports/audio/muse-sequencer/work/muse-muse_3_1_1/muse3/muse/components/copy_on_write.h:26:10: fatal error: 'ui_copy_on_write_base.h' file not found
     #include "ui_copy_on_write_base.h"
             ^~~~~~~~~~~~~~~~~~~~~~~~~

    http://package18.nyi.freebsd.org/data/122amd64-default-foo/2021-04-05_21h03m50s/logs/errors/muse-sequencer-3.1.1_1.log

    https://github.com/michaelforney/samurai/issues/70

    PR:             254678
    Obtained from:  upstream (midieedit, waveedit patches)

 .../files/patch-muse_instruments_CMakeLists.txt (new)   | 17 +++++++++++++++++
 .../files/patch-muse_liste_CMakeLists.txt (new)         | 17 +++++++++++++++++
 .../files/patch-muse_midiedit_CMakeLists.txt (new)      | 11 +++++++++++
 .../files/patch-muse_mixer_CMakeLists.txt (new)         | 17 +++++++++++++++++
 .../files/patch-muse_waveedit_CMakeLists.txt (new)      | 11 +++++++++++
 5 files changed, 73 insertions(+)
Comment 23 Antoine Brodin freebsd_committer freebsd_triage 2021-04-09 15:32:49 UTC
Exp-run looks fine NINJA_DEFAULT=ninja
I will do another run with NINJA_DEFAULT=samurai when you think it is ready
Comment 24 commit-hook freebsd_committer freebsd_triage 2021-04-10 07:15:34 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=20bc3c521ab47cb3435c108a41113e98f8a3d805

commit 20bc3c521ab47cb3435c108a41113e98f8a3d805
Author:     Michael Forney <mforney@mforney.org>
AuthorDate: 2021-04-10 07:15:00 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-10 07:15:00 +0000

    deskutils/bijiben: Add generated biji-marshalers.h to libbiji dependency sources (D29353)

    The meson manual states that

    > Each target that depends on a generated header should add that
    > header to it's sources, as seen above with libfoo and myexe. This
    > is because there is no way for Meson or the backend to know that
    > myexe depends on foo.h just because libfoo does, it could be a
    > private header.

    Since biji-marshalers.h is included by the libbiji public header
    libbiji.h, it must be added as a source to all targets that depend
    on libbiji. This can be done by adding it to the sources of
    libbiji_dep.

    This should unbreak the build with samurai.

    https://github.com/michaelforney/samurai/issues/70

    PR:             254678

 .../files/patch-src_libbiji_meson.build (new)      | 56 ++++++++++++++++++++++
 1 file changed, 56 insertions(+)
Comment 25 commit-hook freebsd_committer freebsd_triage 2021-04-10 07:15:34 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fd4b97fafcd55dee6346f8698c98cd7d8277a7f7

commit fd4b97fafcd55dee6346f8698c98cd7d8277a7f7
Author:     Michael Forney <mforney@mforney.org>
AuthorDate: 2021-04-10 07:14:59 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-10 07:14:59 +0000

    devel/fbthrift: Add missing dependency on RocketUpgrade headers to thriftcpp2 target (D29353)

    One source file in this target, async/HeaderClientChannel.cpp,
    depends on the generated header RocketUpgradeAsyncClient.h, so it
    needs to depend on the target that generates this header.

    This causes a build error with samurai due to an incorrect build
    order, and can be reproduced with ninja as well by building
    thrift/lib/cpp2/CMakeFiles/thriftcpp2.dir/async/HeaderClientChannel.cpp.o
    directly with an empty .ninja_deps.

    https://github.com/michaelforney/samurai/issues/70

    PR:             254678

 .../patch-thrift_lib_cpp2_CMakeLists.txt (new)     | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)
Comment 26 Tobias Kortkamp freebsd_committer freebsd_triage 2021-04-10 07:49:53 UTC
Comment on attachment 223791 [details]
v1

(In reply to Antoine Brodin from comment #23)
I believe that all failures have been addressed now, so I think it is ready
for another exp-run.
Comment 27 commit-hook freebsd_committer freebsd_triage 2021-04-10 19:24:14 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=184fb3b97dad08d285e583c05a20ad8d71875d3d

commit 184fb3b97dad08d285e583c05a20ad8d71875d3d
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-10 19:10:23 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-10 19:21:40 +0000

    devel/samurai: Update to 1.2-16-gca5a6ba

    This makes --version return 1.9.0 instead of 1.9.  qt5-webengine's
    configure checks for system ninja and tries to parse --version and
    expects it to have 3 components.  Without this qt5-webengine falls
    back to using a bundled copy of ninja instead.

    https://github.com/michaelforney/samurai/issues/70

    PR:             254678

 devel/samurai/Makefile | 4 ++--
 devel/samurai/distinfo | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
Comment 29 Tobias Kortkamp freebsd_committer freebsd_triage 2021-04-13 07:13:58 UTC
The kooka and peruse failures look like fallout from the recent
USE_GITLAB changes.

py-or-tools also fails to build with ninja with the same error:
http://beefy6.nyi.freebsd.org/data/122amd64-default/4c2cc95952a6/logs/errors/py37-or-tools-8.1_1.log

Looking at www/deno...
Comment 30 commit-hook freebsd_committer freebsd_triage 2021-04-20 07:00:23 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a91d65363fe8aa72bdf427bb639b0fe258ee7c01

commit a91d65363fe8aa72bdf427bb639b0fe258ee7c01
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-06 07:23:13 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-20 06:57:34 +0000

    Mk/Uses/ninja.mk: Add support for devel/samurai (D29353)

    Samurai is a Ninja-compatible build tool with fewer dependencies
    than Ninja.  Hook it to the framework via a new NINJA_DEFAULT.

    This also adds %p to NINJA_STATUS to make Ninja or Samurai print
    the percentage of completed jobs to make it easier to eyeball how
    much of the build is done.

    PR:             254678
    Exp-run by:     antoine

 Mk/Uses/ninja.mk              | 61 +++++++++++++++++++++++++++++++++++++++----
 Mk/bsd.default-versions.mk    |  4 ++-
 devel/jiri/Makefile           |  5 ++--
 devel/meson/Makefile          |  3 +--
 devel/tinygo/Makefile         |  5 ++--
 graphics/py-h3/Makefile       |  3 +--
 japanese/mozc-server/Makefile |  7 +++--
 lang/mono6.8/Makefile         |  2 +-
 lang/rust-bootstrap/Makefile  |  3 +--
 lang/rust/Makefile            |  5 ++--
 math/py-pdal/Makefile         |  5 ++--
 math/sage/Makefile            |  8 +++---
 multimedia/handbrake/Makefile |  4 +--
 sysutils/fluxengine/Makefile  |  4 +--
 www/deno/Makefile             |  4 +--
 www/qt5-webengine/Makefile    |  3 +--
 16 files changed, 84 insertions(+), 42 deletions(-)
Comment 31 commit-hook freebsd_committer freebsd_triage 2021-04-20 07:00:24 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ff2796d5bc837b0c6cb26791439c64f96fe1c090

commit ff2796d5bc837b0c6cb26791439c64f96fe1c090
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-08 09:33:03 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-20 06:57:35 +0000

    Mk/Uses/meson.mk: Do not force color output (D29353)

    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.

    PR:             254678
    Exp-run by:     antoine

 Mk/Uses/meson.mk                                   |  5 +++++
 devel/meson/Makefile                               |  1 +
 ...atch-mesonbuild_compilers_mixins_clang.py (new) | 24 ++++++++++++++++++++++
 3 files changed, 30 insertions(+)
Comment 32 Tobias Kortkamp freebsd_committer freebsd_triage 2021-04-20 07:01:23 UTC
I cannot reproduce the problem with deno-1.8.3. Maybe the problem is gone
or maybe I have just been unlucky. Can you try to build www/deno again?
Comment 33 Tobias Kortkamp freebsd_committer freebsd_triage 2021-04-20 08:42:30 UTC
(In reply to Tobias Kortkamp from comment #32)
If it does happen again, can I get a copy of the working directory too?
Comment 34 Antoine Brodin freebsd_committer freebsd_triage 2021-04-26 11:52:59 UTC
(In reply to Tobias Kortkamp from comment #32)
I couldn't reproduce the problem with deno-1.9.1
Comment 35 Tobias Kortkamp freebsd_committer freebsd_triage 2021-06-04 09:17:18 UTC
(In reply to Antoine Brodin from comment #34)
Ok, thanks for trying again. Let's close the bug then.