git: ee27eedcdbc7 - main - devel/gn: Update to v2175
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 25 Jun 2024 16:15:12 UTC
The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=ee27eedcdbc765a8034d438f074ece2055275bda commit ee27eedcdbc765a8034d438f074ece2055275bda Author: Oleh Hushchenkov <o.hushchenkov@gmail.com> AuthorDate: 2024-06-24 08:39:09 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> CommitDate: 2024-06-25 16:15:00 +0000 devel/gn: Update to v2175 ChangeLog: https://gn.googlesource.com/gn/ * Do not cleanup args.gn imports located in the output directory. * Fix expectations in NinjaRustBinaryTargetWriterTest.SwiftModule * Do not add native dependencies to the library search path * Support linking frameworks and swiftmodules in Rust targets * [desc] Silence print() statements when outputing json PR: 279925 Reported by: o.hushchenkov@gmail.com (maintainer) --- devel/gn/Makefile | 4 ++-- devel/gn/distinfo | 6 +++--- devel/gn/files/patch-build_gen.py | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/devel/gn/Makefile b/devel/gn/Makefile index e7192a22d822..a96162792e83 100644 --- a/devel/gn/Makefile +++ b/devel/gn/Makefile @@ -1,6 +1,6 @@ PORTNAME= gn DISTVERSIONPREFIX= v -DISTVERSION= 2124 +DISTVERSION= 2175 CATEGORIES= devel MAINTAINER= o.hushchenkov@gmail.com @@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_riscv64= fails to build: ../src/util/build_config.h:168:2: Please add support for your architecture in build_config.h -USES= alias compiler:c++17-lang ninja python:build shebangfix +USES= alias compiler:c++20-lang ninja python:build shebangfix USE_GITHUB= yes GH_ACCOUNT= cglogic # mirror SHEBANG_FILES= ${CONFIGURE_SCRIPT} diff --git a/devel/gn/distinfo b/devel/gn/distinfo index 77b8ada3b647..175c9076749e 100644 --- a/devel/gn/distinfo +++ b/devel/gn/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1698822256 -SHA256 (cglogic-gn-v2124_GH0.tar.gz) = 91ab314affb97c61cd4037520e873438ffa356bf6bbbbfc086e7bc3e9e9a20e3 -SIZE (cglogic-gn-v2124_GH0.tar.gz) = 1068534 +TIMESTAMP = 1719132779 +SHA256 (cglogic-gn-v2175_GH0.tar.gz) = 8efe603f8ae03bfa3911d30db7843bd814f9940bef67b509717e4db49dd160b2 +SIZE (cglogic-gn-v2175_GH0.tar.gz) = 1086073 diff --git a/devel/gn/files/patch-build_gen.py b/devel/gn/files/patch-build_gen.py index 38d7a6af59ff..b9a54cc80a22 100644 --- a/devel/gn/files/patch-build_gen.py +++ b/devel/gn/files/patch-build_gen.py @@ -1,16 +1,16 @@ - .git/ is missing in archive, so use version from environment ---- build/gen.py.orig 2023-11-01 07:04:33 UTC +--- build/gen.py.orig 2024-06-23 08:56:53 UTC +++ build/gen.py -@@ -225,25 +225,16 @@ def GenerateLastCommitPosition(host, header): - +@@ -241,25 +241,16 @@ def GenerateLastCommitPosition(host, header): + return ret.returncode == 0 and "#define __GNUC__" in ret.stdout and not "#define __clang__" in ret.stdout def GenerateLastCommitPosition(host, header): - ROOT_TAG = 'initial-commit' - describe_output = subprocess.check_output( - ['git', 'describe', 'HEAD', '--abbrev=12', '--match', ROOT_TAG], - shell=host.is_windows(), cwd=REPO_ROOT) -- mo = re.match(ROOT_TAG + '-(\d+)-g([0-9a-f]+)', describe_output.decode()) +- mo = re.match(ROOT_TAG + r'-(\d+)-g([0-9a-f]+)', describe_output.decode()) - if not mo: - raise ValueError( - 'Unexpected output from git describe when generating version header') @@ -30,7 +30,7 @@ # Only write/touch this file if the commit position has changed. old_contents = '' -@@ -286,7 +277,7 @@ def WriteGenericNinja(path, static_libraries, executab +@@ -302,7 +293,7 @@ def WriteGenericNinja(path, static_libraries, executab 'msys': 'build_linux.ninja.template', 'darwin': 'build_mac.ninja.template', 'linux': 'build_linux.ninja.template',