svn commit: r549458 - in head/devel/gn: . files
Steve Wills
swills at FreeBSD.org
Mon Sep 21 16:46:19 UTC 2020
Author: swills
Date: Mon Sep 21 16:46:18 2020
New Revision: 549458
URL: https://svnweb.freebsd.org/changeset/ports/549458
Log:
devel/gn: Fix build on 11.4 and 11-STABLE
PR: 249504
Submitted by: Oleh Hushchenkov <o.hushchenkov at gmail.com> (maintainer)
Added:
head/devel/gn/files/patch-src_gn_version.h (contents, props changed)
Modified:
head/devel/gn/Makefile (contents, props changed)
head/devel/gn/files/patch-build_gen.py (contents, props changed)
Modified: head/devel/gn/Makefile
==============================================================================
--- head/devel/gn/Makefile Mon Sep 21 16:46:00 2020 (r549457)
+++ head/devel/gn/Makefile Mon Sep 21 16:46:18 2020 (r549458)
@@ -3,6 +3,7 @@
PORTNAME= gn
DISTVERSIONPREFIX= v
DISTVERSION= 1823
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= o.hushchenkov at gmail.com
Modified: head/devel/gn/files/patch-build_gen.py
==============================================================================
--- head/devel/gn/files/patch-build_gen.py Mon Sep 21 16:46:00 2020 (r549457)
+++ head/devel/gn/files/patch-build_gen.py Mon Sep 21 16:46:18 2020 (r549458)
@@ -1,8 +1,8 @@
- .git/ is missing in archive, so use version from environment
---- build/gen.py.orig 2020-02-22 10:07:32 UTC
+--- build/gen.py.orig 2020-09-21 09:20:32 UTC
+++ build/gen.py
-@@ -124,25 +124,16 @@ def main(argv):
+@@ -149,25 +149,16 @@ def main(argv):
def GenerateLastCommitPosition(host, header):
Added: head/devel/gn/files/patch-src_gn_version.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/gn/files/patch-src_gn_version.h Mon Sep 21 16:46:18 2020 (r549458)
@@ -0,0 +1,18 @@
+--- src/gn/version.h.orig 2020-09-21 09:21:46 UTC
++++ src/gn/version.h
+@@ -8,6 +8,15 @@
+ #include <optional>
+ #include <string>
+
++// Undefine major/minor from sys/types.h
++#ifdef major
++#undef major
++#endif
++
++#ifdef minor
++#undef minor
++#endif
++
+ // Represents a semantic version.
+ class Version {
+ public:
More information about the svn-ports-head
mailing list