git: 1e1a1e9ebc2a - main - devel/ninja: Roll back to 1.11.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 22 May 2024 17:13:17 UTC
The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=1e1a1e9ebc2aae54c1c274ac3bbe329de54704b3 commit 1e1a1e9ebc2aae54c1c274ac3bbe329de54704b3 Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2024-05-22 16:45:35 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2024-05-22 17:13:01 +0000 devel/ninja: Roll back to 1.11.1 Despite passing an exp-run and successful local builds, there still exists a race condition in www/qt[56]-webengine when building with ninja 1.12.x that is proving difficult to solve. After a successful build, it seems subsequent builds fail when using ccache with a generated header missing before it is needed at compile time. Even after adding //chrome/app:generated_resources_grit as a dep in src/3rdparty/chromium/chrome/browser/devtools/BUILD.gn, the build is still failing with: ../../../../../qtwebengine-everywhere-src-6.7.0/src/3rdparty/chromium/chrome/browser/devtools/devtools_file_helper.cc:31:10: fatal error: 'chrome/grit/generated_resources.h' file not found This comes very late in the build, so trial and error attempts to fix this are tedious, costing an hour+ of build time with each attempt. Reverting to ninja 1.11.1 gets things building again while this can sorted out in the background under less stressful conditions. This partially reverts bb0835fd3aa268260cc9eae4ba0cad55814d6265. PR: 279162, 279164 Reported by: Robert Cina <transitive@gmail.com> --- devel/ninja/Makefile | 4 ++-- devel/ninja/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devel/ninja/Makefile b/devel/ninja/Makefile index b4f595cb18b4..27d411e3bad9 100644 --- a/devel/ninja/Makefile +++ b/devel/ninja/Makefile @@ -1,7 +1,7 @@ PORTNAME= ninja -PORTVERSION= 1.12.0 +PORTVERSION= 1.11.1 DISTVERSIONPREFIX= v -PORTEPOCH= 3 +PORTEPOCH= 4 CATEGORIES= devel MAINTAINER= kde@FreeBSD.org diff --git a/devel/ninja/distinfo b/devel/ninja/distinfo index 6d1c18739ea2..c9fcd675c558 100644 --- a/devel/ninja/distinfo +++ b/devel/ninja/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1714464552 -SHA256 (ninja-build-ninja-v1.12.0_GH0.tar.gz) = 8b2c86cd483dc7fcb7975c5ec7329135d210099a89bc7db0590a07b0bbfe49a5 -SIZE (ninja-build-ninja-v1.12.0_GH0.tar.gz) = 240291 +TIMESTAMP = 1716360440 +SHA256 (ninja-build-ninja-v1.11.1_GH0.tar.gz) = 31747ae633213f1eda3842686f83c2aa1412e0f5691d1c14dbbcc67fe7400cea +SIZE (ninja-build-ninja-v1.11.1_GH0.tar.gz) = 229479