diff --git a/devel/gn/Makefile b/devel/gn/Makefile index beddd39ee45c..eae375a18de0 100644 --- a/devel/gn/Makefile +++ b/devel/gn/Makefile @@ -1,43 +1,43 @@ # Created by: Oleh Hushchenkov PORTNAME= gn DISTVERSIONPREFIX= v -DISTVERSION= 1897 +DISTVERSION= 1962 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/"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 5269f68d8c41..39b4b96fb71b 100644 --- a/devel/gn/distinfo +++ b/devel/gn/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619271291 -SHA256 (cglogic-gn-v1897_GH0.tar.gz) = 94762fc85346bd0a2ed648852563554b173cc17ef16bc06972f5b3a7a9979235 -SIZE (cglogic-gn-v1897_GH0.tar.gz) = 1011867 +TIMESTAMP = 1639844136 +SHA256 (cglogic-gn-v1962_GH0.tar.gz) = cd7393695af1160e71b59ea6e6bc51de7bb0c54d03dd93a8e6046239366cd387 +SIZE (cglogic-gn-v1962_GH0.tar.gz) = 1025892 diff --git a/devel/gn/files/patch-build_gen.py b/devel/gn/files/patch-build_gen.py index 6cf53918e3c1..402cef5f9f7e 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 2021-04-24 13:35:05 UTC +--- build/gen.py.orig 2021-12-18 16:25:54 UTC +++ build/gen.py -@@ -151,25 +151,16 @@ def main(argv): +@@ -213,25 +213,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 6e7554c7fcc9..7e2fc6f9a3fc 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 2021-04-06 17:41:35 UTC +--- src/gn/args.cc.orig 2021-12-17 12:22:18 UTC +++ src/gn/args.cc -@@ -357,7 +357,7 @@ void Args::SetSystemVarsLocked(Scope* dest) const { +@@ -360,7 +360,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. diff --git a/devel/gn/files/patch-src_gn_version.h b/devel/gn/files/patch-src_gn_version.h deleted file mode 100644 index ca1c72f8979a..000000000000 --- a/devel/gn/files/patch-src_gn_version.h +++ /dev/null @@ -1,18 +0,0 @@ ---- src/gn/version.h.orig 2020-09-21 09:21:46 UTC -+++ src/gn/version.h -@@ -8,6 +8,15 @@ - #include - #include - -+// Undefine major/minor from sys/types.h -+#ifdef major -+#undef major -+#endif -+ -+#ifdef minor -+#undef minor -+#endif -+ - // Represents a semantic version. - class Version { - public: