Date: Wed, 7 Apr 2021 04:20:17 GMT From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 6428be406482 - main - x11/brisk-menu: Attempt to fix build order bug (D29353) Message-ID: <202104070420.1374KHHo023337@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tobik: 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 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/x11/brisk-menu/files/patch-src_meson.build b/x11/brisk-menu/files/patch-src_meson.build new file mode 100644 index 000000000000..5b311b77f43b --- /dev/null +++ b/x11/brisk-menu/files/patch-src_meson.build @@ -0,0 +1,20 @@ +Attempt to unbreak parallel build + +--- src/meson.build.orig 2021-04-05 04:30:02 UTC ++++ src/meson.build +@@ -13,6 +13,7 @@ libresources = static_library( + + link_libresources = declare_dependency( + link_with: libresources, ++ sources: brisk_resources, + include_directories: [ + data_include, + ], +@@ -38,6 +39,7 @@ libsession_stub = static_library( + # Allow linking to the stub + link_libsession_stub = declare_dependency( + link_with: libsession_stub, ++ sources: [libsaver_glue, libsession_glue], + dependencies: [ + dep_gio_unix, + ],
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104070420.1374KHHo023337>