View | Details | Raw Unified | Return to bug 267867
Collapse All | Expand All

(-)b/devel/gn/Makefile (-2 / +1 lines)
Lines 1-7 Link Here
1
PORTNAME=	gn
1
PORTNAME=	gn
2
DISTVERSIONPREFIX=	v
2
DISTVERSIONPREFIX=	v
3
DISTVERSION=	1962
3
DISTVERSION=	2072
4
PORTREVISION=	1
5
CATEGORIES=	devel
4
CATEGORIES=	devel
6
5
7
MAINTAINER=	o.hushchenkov@gmail.com
6
MAINTAINER=	o.hushchenkov@gmail.com
(-)b/devel/gn/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1639844136
1
TIMESTAMP = 1668875475
2
SHA256 (cglogic-gn-v1962_GH0.tar.gz) = cd7393695af1160e71b59ea6e6bc51de7bb0c54d03dd93a8e6046239366cd387
2
SHA256 (cglogic-gn-v2072_GH0.tar.gz) = db79ae073bcac3944c56f5f166c4b764a58c06594134c85b742bf859b42c5a66
3
SIZE (cglogic-gn-v1962_GH0.tar.gz) = 1025892
3
SIZE (cglogic-gn-v2072_GH0.tar.gz) = 1056984
(-)b/devel/gn/files/patch-build_gen.py (-5 / +5 lines)
Lines 1-15 Link Here
1
- .git/ is missing in archive, so use version from environment
1
- .git/ is missing in archive, so use version from environment
2
2
3
--- build/gen.py.orig	2021-12-21 20:25:21 UTC
3
--- build/gen.py.orig	2022-11-19 16:33:38 UTC
4
+++ build/gen.py
4
+++ build/gen.py
5
@@ -213,25 +213,16 @@ def main(argv):
5
@@ -216,25 +216,16 @@ def main(argv):
6
 
6
 
7
 
7
 
8
 def GenerateLastCommitPosition(host, header):
8
 def GenerateLastCommitPosition(host, header):
9
-  ROOT_TAG = 'initial-commit'
9
-  ROOT_TAG = 'initial-commit'
10
-  describe_output = subprocess.check_output(
10
-  describe_output = subprocess.check_output(
11
-      ['git', 'describe', 'HEAD', '--match', ROOT_TAG], shell=host.is_windows(),
11
-      ['git', 'describe', 'HEAD', '--abbrev=12', '--match', ROOT_TAG],
12
-      cwd=REPO_ROOT)
12
-      shell=host.is_windows(), cwd=REPO_ROOT)
13
-  mo = re.match(ROOT_TAG + '-(\d+)-g([0-9a-f]+)', describe_output.decode())
13
-  mo = re.match(ROOT_TAG + '-(\d+)-g([0-9a-f]+)', describe_output.decode())
14
-  if not mo:
14
-  if not mo:
15
-    raise ValueError(
15
-    raise ValueError(
Lines 30-36 Link Here
30
 
30
 
31
   # Only write/touch this file if the commit position has changed.
31
   # Only write/touch this file if the commit position has changed.
32
   old_contents = ''
32
   old_contents = ''
33
@@ -274,7 +265,7 @@ def WriteGenericNinja(path, static_libraries, executab
33
@@ -277,7 +268,7 @@ def WriteGenericNinja(path, static_libraries, executab
34
       'msys': 'build_linux.ninja.template',
34
       'msys': 'build_linux.ninja.template',
35
       'darwin': 'build_mac.ninja.template',
35
       'darwin': 'build_mac.ninja.template',
36
       'linux': 'build_linux.ninja.template',
36
       'linux': 'build_linux.ninja.template',
(-)b/devel/gn/files/patch-src_gn_args.cc (-2 / +2 lines)
Lines 1-6 Link Here
1
--- src/gn/args.cc.orig	2021-12-17 12:22:18 UTC
1
--- src/gn/args.cc.orig	2022-11-19 16:37:02 UTC
2
+++ src/gn/args.cc
2
+++ src/gn/args.cc
3
@@ -360,7 +360,7 @@ void Args::SetSystemVarsLocked(Scope* dest) const {
3
@@ -362,7 +362,7 @@ void Args::SetSystemVarsLocked(Scope* dest) const {
4
     arch = kMips64;
4
     arch = kMips64;
5
   else if (os_arch == "s390x")
5
   else if (os_arch == "s390x")
6
     arch = kS390X;
6
     arch = kS390X;

Return to bug 267867