haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-03-19 01:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

gn, switch to cmd:python3 (#10116)

Browse Source
This commit is contained in:
Schrijvers Luc
2024-02-19 09:01:05 +00:00
committed by GitHub
parent d2245081d5
commit 13f5e49851
4 changed files with 58 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dev-build/gn/gn-0.1891.dfcbc6fe.recipe
View File

@@ -3,7 +3,7 @@ DESCRIPTION="GN is a meta-build system that generates build files for Ninja"
HOMEPAGE="https://gn.googlesource.com/"
COPYRIGHT="2008-2019 The Chromium Authors."
LICENSE="BSD (3-clause)"
REVISION="1"
REVISION="2"
srcGitRev="dfcbc6fed0a8352696f92d67ccad54048ad182b3"
SOURCE_URI="https://github.com/korli/gn/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="4ee625124f0805abe419420a5ffd1a5035b95cbb983dd06c75f4bfa2cab5b517"
@@ -36,7 +36,7 @@ BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:g++$secondaryArchSuffix
cmd:ninja
cmd:python
cmd:python3
cmd:git
cmd:sed
"
@@ -52,7 +52,7 @@ BUILD()
"s/(999999, 999999, \"091169b\")/(\"1891\", \"1891\", \"$GN_COMMIT_VERSION_SHORT\")/g" \
build/gen.py
python build/gen.py --host haiku --platform=haiku
python3 build/gen.py --host haiku --platform=haiku
ninja -C out $jobArgs
}

6
dev-build/gn/gn1731-0.1731.5ed3c9cc.recipe
View File

@@ -3,7 +3,7 @@ DESCRIPTION="GN is a meta-build system that generates build files for Ninja"
HOMEPAGE="https://gn.googlesource.com/"
COPYRIGHT="2008-2019 The Chromium Authors."
LICENSE="BSD (3-clause)"
REVISION="1"
REVISION="2"
srcGitRev="5ed3c9cc67b090d5e311e4bd2aba072173e82db9"
SOURCE_URI="https://github.com/korli/gn/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="b018b5dbb484997dc0c0c693c4d7efbec76b8e26e845465c3cb7aba0e3d3db6c"
@@ -39,7 +39,7 @@ BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:g++$secondaryArchSuffix
cmd:ninja
cmd:python2
cmd:python3
cmd:sed
"
@@ -54,7 +54,7 @@ BUILD()
"s/(999999, 999999, \"091169b\")/(\"1731\", \"1731\", \"$GN_COMMIT_VERSION_SHORT\")/g" \
build/gen.py
python2 build/gen.py --host haiku --platform=haiku -d
python3 build/gen.py --host haiku --platform=haiku -d
ninja -C out $jobArgs
}

34
dev-build/gn/patches/gn-0.1731.5ed3c9cc.patchset
View File

@@ -1,4 +1,4 @@
From 2cbdbcd2cc09488045fb25e10cf6ad9fe640db1b Mon Sep 17 00:00:00 2001
From 412e0978f3bd38b4ffcb88a5f18c38ba795957df Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Sun, 21 Apr 2019 00:05:13 +0200
Subject: Haiku support
@@ -6,10 +6,10 @@ Subject: Haiku support
Original patchset by Calvin Hill <calvin@hakobaito.co.uk>
diff --git a/build/gen.py b/build/gen.py
index 922bf46..8a42fd3 100755
index 95d9b44..78380d3 100755
--- a/build/gen.py
+++ b/build/gen.py
@@ -151,15 +151,6 @@ def main(argv):
@@ -124,15 +124,6 @@ def main(argv):
def GenerateLastCommitPosition(host, header):
@@ -25,7 +25,7 @@ index 922bf46..8a42fd3 100755
contents = '''// Generated by build/gen.py.
#ifndef OUT_LAST_COMMIT_POSITION_H_
@@ -169,7 +160,7 @@ def GenerateLastCommitPosition(host, header):
@@ -142,7 +133,7 @@ def GenerateLastCommitPosition(host, header):
#define LAST_COMMIT_POSITION "%s (%s)"
#endif // OUT_LAST_COMMIT_POSITION_H_
@@ -34,7 +34,7 @@ index 922bf46..8a42fd3 100755
# Only write/touch this file if the commit position has changed.
old_contents = ''
@@ -363,7 +354,7 @@ def WriteGNNinja(path, platform, host, options):
@@ -324,7 +315,7 @@ def WriteGNNinja(path, platform, host, options):
cflags.extend([
'-D_FILE_OFFSET_BITS=64',
'-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS',
@@ -44,5 +44,27 @@ index 922bf46..8a42fd3 100755
'-fno-exceptions',
'-fno-rtti',
--
2.30.0
2.42.1
From ee03f53301d7111db0cd00ae3dc9adca2eb8db08 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Sun, 18 Feb 2024 16:01:38 +0100
Subject: Disable deprecated warnings
diff --git a/build/gen.py b/build/gen.py
index 78380d3..b5c063b 100755
--- a/build/gen.py
+++ b/build/gen.py
@@ -323,6 +323,7 @@ def WriteGNNinja(path, platform, host, options):
'-Wall',
'-Wextra',
'-Wno-unused-parameter',
+ '-Wno-deprecated-copy',
'-std=c++17'
])
--
2.42.1

26
dev-build/gn/patches/gn-0.1891.dfcbc6fe.patchset
View File

@@ -1,4 +1,4 @@
From 2cbdbcd2cc09488045fb25e10cf6ad9fe640db1b Mon Sep 17 00:00:00 2001
From 3c96436d127fdd37d68b01341a60e27f09aa3734 Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Sun, 21 Apr 2019 00:05:13 +0200
Subject: Haiku support
@@ -66,5 +66,27 @@ index 349cbfe..1faf7fa 100644
int64_t last_modified_nsec = 0;
time_t last_accessed_sec = stat_info.st_atime;
--
2.30.0
2.42.1
From a3f1533b5aeed9ae16c93f5bf38e82fe9cee645f Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Sun, 18 Feb 2024 15:58:32 +0100
Subject: Disable deprecated warnings
diff --git a/build/gen.py b/build/gen.py
index 8a42fd3..080248e 100755
--- a/build/gen.py
+++ b/build/gen.py
@@ -362,6 +362,7 @@ def WriteGNNinja(path, platform, host, options):
'-Wall',
'-Wextra',
'-Wno-unused-parameter',
+ '-Wno-deprecated-copy',
'-std=c++17'
])
--
2.42.1