diff --git a/devel/gn/Makefile b/devel/gn/Makefile index 3ef5221bd747..beddd39ee45c 100644 --- a/devel/gn/Makefile +++ b/devel/gn/Makefile @@ -1,42 +1,43 @@ +# Created by: Oleh Hushchenkov + PORTNAME= gn DISTVERSIONPREFIX= v -DISTVERSION= 1823 -PORTREVISION= 2 +DISTVERSION= 1897 CATEGORIES= devel MAINTAINER= o.hushchenkov@gmail.com COMMENT= Gn meta build framework - standalone version LICENSE= BSD3CLAUSE 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 USE_GITHUB= yes GH_ACCOUNT= cglogic # mirror SHEBANG_FILES= ${CONFIGURE_SCRIPT} HAS_CONFIGURE= yes CONFIGURE_SCRIPT= build/gen.py CONFIGURE_ARGS= --platform freebsd ${WITH_DEBUG:D--debug} CONFIGURE_ENV= GN_VERSION=${PORTVERSION} CONFIGURE_OUTSOURCE= yes ALL_TARGET= # empty CONFLICTS_INSTALL= chromium-gn CONFIGURE_WRKSRC= ${WRKSRC}/out # --out-path breaks "make test" PLIST_FILES= bin/${PORTNAME} post-patch: - @${REINPLACE_CMD} 's/"python"/"${PYTHON_CMD:T}"/' \ + @${REINPLACE_CMD} 's/"python3"/"${PYTHON_CMD:T}"/' \ ${WRKSRC}/src/gn/exec_process_unittest.cc do-install: ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin do-test: ${TEST_WRKSRC}/gn_unittests .include diff --git a/devel/gn/distinfo b/devel/gn/distinfo index d1ea49078c58..5269f68d8c41 100644 --- a/devel/gn/distinfo +++ b/devel/gn/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1597572639 -SHA256 (cglogic-gn-v1823_GH0.tar.gz) = c1780642bf2fe31d50823a0dc8d81715b8accd343885618c74642240b6f42a00 -SIZE (cglogic-gn-v1823_GH0.tar.gz) = 996749 +TIMESTAMP = 1619271291 +SHA256 (cglogic-gn-v1897_GH0.tar.gz) = 94762fc85346bd0a2ed648852563554b173cc17ef16bc06972f5b3a7a9979235 +SIZE (cglogic-gn-v1897_GH0.tar.gz) = 1011867 diff --git a/devel/gn/files/patch-build_gen.py b/devel/gn/files/patch-build_gen.py index 294d29a35897..6cf53918e3c1 100644 --- a/devel/gn/files/patch-build_gen.py +++ b/devel/gn/files/patch-build_gen.py @@ -1,32 +1,32 @@ - .git/ is missing in archive, so use version from environment ---- build/gen.py.orig 2020-09-21 09:20:32 UTC +--- build/gen.py.orig 2021-04-24 13:35:05 UTC +++ build/gen.py -@@ -149,25 +149,16 @@ def main(argv): +@@ -151,25 +151,16 @@ def main(argv): def GenerateLastCommitPosition(host, header): - ROOT_TAG = 'initial-commit' - describe_output = subprocess.check_output( - ['git', 'describe', 'HEAD', '--match', ROOT_TAG], shell=host.is_windows(), - cwd=REPO_ROOT) - mo = re.match(ROOT_TAG + '-(\d+)-g([0-9a-f]+)', describe_output.decode()) - if not mo: - raise ValueError( - 'Unexpected output from git describe when generating version header') - contents = '''// Generated by build/gen.py. #ifndef OUT_LAST_COMMIT_POSITION_H_ #define OUT_LAST_COMMIT_POSITION_H_ #define LAST_COMMIT_POSITION_NUM %s -#define LAST_COMMIT_POSITION "%s (%s)" +#define LAST_COMMIT_POSITION "%s" #endif // OUT_LAST_COMMIT_POSITION_H_ -''' % (mo.group(1), mo.group(1), mo.group(2)) +''' % (os.environ['GN_VERSION'], os.environ['GN_VERSION']) # Only write/touch this file if the commit position has changed. old_contents = '' diff --git a/devel/gn/files/patch-src_gn_args.cc b/devel/gn/files/patch-src_gn_args.cc index d245f45883e5..6e7554c7fcc9 100644 --- a/devel/gn/files/patch-src_gn_args.cc +++ b/devel/gn/files/patch-src_gn_args.cc @@ -1,11 +1,11 @@ ---- src/gn/args.cc.orig 2020-11-25 15:41:38 UTC +--- src/gn/args.cc.orig 2021-04-06 17:41:35 UTC +++ src/gn/args.cc -@@ -354,7 +354,7 @@ void Args::SetSystemVarsLocked(Scope* dest) const { +@@ -357,7 +357,7 @@ void Args::SetSystemVarsLocked(Scope* dest) const { arch = kMips64; else if (os_arch == "s390x") arch = kS390X; - else if (os_arch == "ppc64" || os_arch == "ppc64le") + else if (os_arch == "ppc64" || os_arch == "ppc64le" || os_arch == "powerpc") // We handle the endianness inside //build/config/host_byteorder.gni. // This allows us to use the same toolchain as ppc64 BE // and specific flags are included using the host_byteorder logic.