gn: update to 0.2163 (#20638)
This commit is contained in:
parent
6487fa5eeb
commit
65ae292618
@ -18,7 +18,7 @@ index 00000000..27339a7f
|
||||
+ command = $ld $ldflags -o $out -Wl,--start-group $in $libs -Wl,--end-group $solibs
|
||||
+ description = LINK $out
|
||||
diff --git a/build/gen.py b/build/gen.py
|
||||
index adb622a9..00a01898 100755
|
||||
index 9168035b..0b6468ab 100755
|
||||
--- a/build/gen.py
|
||||
+++ b/build/gen.py
|
||||
@@ -40,7 +40,10 @@ class Platform(object):
|
||||
@ -33,7 +33,7 @@ index adb622a9..00a01898 100755
|
||||
elif self._platform.startswith('aix'):
|
||||
self._platform = 'aix'
|
||||
elif self._platform.startswith('fuchsia'):
|
||||
@@ -282,7 +285,7 @@ def WriteGenericNinja(path, static_libraries, executables,
|
||||
@@ -298,7 +301,7 @@ def WriteGenericNinja(path, static_libraries, executables,
|
||||
|
||||
template_filename = os.path.join(SCRIPT_DIR, {
|
||||
'msvc': 'build_win.ninja.template',
|
||||
@ -42,7 +42,7 @@ index adb622a9..00a01898 100755
|
||||
'msys': 'build_linux.ninja.template',
|
||||
'darwin': 'build_mac.ninja.template',
|
||||
'linux': 'build_linux.ninja.template',
|
||||
@@ -299,10 +302,14 @@ def WriteGenericNinja(path, static_libraries, executables,
|
||||
@@ -315,10 +318,14 @@ def WriteGenericNinja(path, static_libraries, executables,
|
||||
with open(template_filename) as f:
|
||||
ninja_template = f.read()
|
||||
|
||||
@ -58,7 +58,7 @@ index adb622a9..00a01898 100755
|
||||
else:
|
||||
executable_ext = ''
|
||||
library_ext = '.a'
|
||||
@@ -378,10 +385,18 @@ def WriteGNNinja(path, platform, host, options, args_list):
|
||||
@@ -394,10 +401,18 @@ def WriteGNNinja(path, platform, host, options, args_list):
|
||||
cxx = os.environ.get('CXX', 'g++')
|
||||
ld = os.environ.get('LD', 'g++')
|
||||
ar = os.environ.get('AR', 'ar -X64')
|
||||
@ -78,20 +78,10 @@ index adb622a9..00a01898 100755
|
||||
else:
|
||||
cxx = os.environ.get('CXX', 'clang++')
|
||||
ld = cxx
|
||||
@@ -469,6 +484,9 @@ def WriteGNNinja(path, platform, host, options, args_list):
|
||||
'-std=c++17'
|
||||
])
|
||||
|
||||
+ if cxx == 'g++':
|
||||
+ cflags.extend(['-Wno-restrict'])
|
||||
+
|
||||
# flags not supported by gcc/g++.
|
||||
if cxx == 'clang++':
|
||||
cflags.extend(['-Wrange-loop-analysis', '-Wextra-semi-stmt'])
|
||||
@@ -481,6 +499,7 @@ def WriteGNNinja(path, platform, host, options, args_list):
|
||||
@@ -507,6 +522,7 @@ def WriteGNNinja(path, platform, host, options, args_list):
|
||||
|
||||
if platform.is_mingw() or platform.is_msys():
|
||||
cflags.remove('-std=c++17')
|
||||
cflags.remove('-std=c++20')
|
||||
+ cflags.remove('-pthread')
|
||||
cflags.extend([
|
||||
'-Wno-deprecated-copy',
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
_realname=gn
|
||||
pkgbase=mingw-w64-${_realname}
|
||||
pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
|
||||
pkgver=0.2131.85944ebc
|
||||
pkgver=0.2163.d823fd85
|
||||
pkgrel=1
|
||||
pkgdesc='Meta-build system that generates build files for Ninja (mingw-w64)'
|
||||
arch=('any')
|
||||
@ -15,14 +15,14 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
|
||||
"${MINGW_PACKAGE_PREFIX}-ninja"
|
||||
"${MINGW_PACKAGE_PREFIX}-python"
|
||||
"git")
|
||||
_commit=85944ebc24a90ec1e489e85a46fdc68542c3146f
|
||||
_commit=d823fd85da3fb83146f734377da454473b93a2b2
|
||||
source=(git+https://gn.googlesource.com/gn#commit=$_commit
|
||||
001-build-fixes.patch
|
||||
002-add-missing-header.patch
|
||||
003-remove-msvc-flags.patch
|
||||
004-add-arm64-arch.patch)
|
||||
sha256sums=('SKIP'
|
||||
'8834b44cbf1a46fd4459ff41defe84b5d97d204ffb1464365a6bd3e0496bae57'
|
||||
'c8697b2ab981c73b7dacbedb1bd1650421626e662c92d9c3c1f63dc18e9919cd'
|
||||
'd41ea264f389a34b3030ab5fb39107475a0e913123802dee241a20e1e5ecb1a5'
|
||||
'5aec933502008cbe9baabcf57e7899e8153e29c1dea646a52ac71b8eb9306801'
|
||||
'f2b66b481336de86b237b5d6062784323e6f359313a8063a9d670d9356e742d6')
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user