Date: Tue, 7 May 2024 09:05:29 GMT From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: bf067dc10cfd - main - net-im/psi: Fix build with ninja >= 1.12.0 Message-ID: <202405070905.44795TDs039486@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=bf067dc10cfd953b3a49ce2fdd4b89e34b3dcf98 commit bf067dc10cfd953b3a49ce2fdd4b89e34b3dcf98 Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2024-05-07 08:11:25 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2024-05-07 09:05:20 +0000 net-im/psi: Fix build with ninja >= 1.12.0 Address a race condition where included headers generated by uic are not created before they used in the build. Not upstreaming this as the last release was in 2020 and the codebase has diverged too much since then. PR: 278693 Approved by: portmgr (blanket) --- net-im/psi/files/patch-src_tabs_CMakeLists.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/net-im/psi/files/patch-src_tabs_CMakeLists.txt b/net-im/psi/files/patch-src_tabs_CMakeLists.txt new file mode 100644 index 000000000000..7065720f7dfe --- /dev/null +++ b/net-im/psi/files/patch-src_tabs_CMakeLists.txt @@ -0,0 +1,10 @@ +Fix a race condition with ninja >= 1.12.0 where included headers have not +yet been generated by uic. + +--- src/tabs/CMakeLists.txt.orig 2020-09-06 07:44:34 UTC ++++ src/tabs/CMakeLists.txt +@@ -22,3 +22,4 @@ target_include_directories(tabs PUBLIC ${CMAKE_CURRENT + add_library(tabs STATIC ${HEADERS} ${MOC_SOURCES} ${PLAIN_SOURCES}) + target_link_libraries(tabs ${QT_LIBRARIES} ${iris_LIB} tools widgets) + target_include_directories(tabs PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) ++add_dependencies(tabs build_ui_files)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405070905.44795TDs039486>