From nobody Wed May 22 17:13:17 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VkyYn2jdsz5M4MX; Wed, 22 May 2024 17:13:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VkyYn1v22z4fhh; Wed, 22 May 2024 17:13:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716397997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1UZIRmUiNY8aIu1Ekg8VLHnNJ2NtwX52ZsaWwINTZGU=; b=J/MdTnaML4RgL6k4odQdZpKVO8cPRusS1suaR81g+99HjI6X/3D8wvBZgPviUrV+idYkwC QHwP0ZpusF0YUScN92VjNq7D1tBKFodEsIG6nyNfs+TPtuOLVVUY9eEFEUQjY7nnFt/aZ6 znwA2cPPGgD/gsU+PMGsLtbKe2cOnW6VfeN106Xgvxl1f5PoOluHfdKLn7S4V/izY/1YDr E3ZZUfI31CSoh8eGrIrm1uu1AmDDbX5KG4KFP7NIcNp5LR0uO4kMfsBk/H34imNGkQKt5e cgNvliRb741nJoLvkwNKivsivQ143UJLWFoELW8pOhqoQqIg+0iQBgai2QzzTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716397997; a=rsa-sha256; cv=none; b=R0QkFk6ka2G4cotlV6Ml6Pfmr6LEDDk0BF6xruY/PLXAbuijOkhr1BKjg+8urqpHbbu+5x 0s8QheuBj3hn10N2I8TDuGu7I4pFHD7rsQp4iGClU3Wiz18IXr3ah0gcU/ZYM9/TpDHfMu qBXD3rG3bBqJdIQ2FA3qlXcgf21isuE8lYD2w7ChdXritOy134eMedcmFnEPf+hPNxVtrw TaIku2s3OPuJaNfDlJ4J9EO7NJOSkYF7OSdVTQYmORTqlDEDZOiiSIUErxHlb1jfRjjgc0 Cx01E5neqP6xDwkHK8+ZU1ke330xY//TGo3Ml2fxfQ3fMp+eC1OfRNjPdZ4P5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716397997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1UZIRmUiNY8aIu1Ekg8VLHnNJ2NtwX52ZsaWwINTZGU=; b=TvaTPRQbDP388jLyS/S2MmvqoV79dX7+IyrwBYQLOBvLx1zK7UfxUm831MdkhrFafmkUlV NC4beHB2HUCHW1lD8QLg6C2zpsAVTbstKS8pqrJfgoc3ZQhUnOZ6cx88PAO36BIPCgiAOW qhCVSi31WRerYyjXKxiVY+KCP05t8oAlli4b/iR958LdE1d7GXC57oULJlhu+Vh5TlD0DH +mUvWof5ibujdpXk4PrUFv/a7B06n9j5bZbOhzcWbutbZae4wVALwvAwxYfTJrV4BPzeDR t4jTwEYZlS6e/DMMKP7aeWzvpzfppJ3fJbqB8ISk1H05inPQK5K1HWE5fyz9uA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VkyYn1VRKzDyX; Wed, 22 May 2024 17:13:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44MHDHah091496; Wed, 22 May 2024 17:13:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44MHDHoW091493; Wed, 22 May 2024 17:13:17 GMT (envelope-from git) Date: Wed, 22 May 2024 17:13:17 GMT Message-Id: <202405221713.44MHDHoW091493@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 1e1a1e9ebc2a - main - devel/ninja: Roll back to 1.11.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e1a1e9ebc2aae54c1c274ac3bbe329de54704b3 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=1e1a1e9ebc2aae54c1c274ac3bbe329de54704b3 commit 1e1a1e9ebc2aae54c1c274ac3bbe329de54704b3 Author: Jason E. Hale AuthorDate: 2024-05-22 16:45:35 +0000 Commit: Jason E. Hale 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 --- 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