diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 7 | ||||
| -rw-r--r-- | gcc-support.patch | 21 |
4 files changed, 23 insertions, 10 deletions
@@ -1,6 +1,6 @@ pkgbase = gn-git pkgdesc = Meta-build system which generates Ninja build files - pkgver = r1498.13ac6ca4 + pkgver = r1523.377ad041 pkgrel = 1 url = https://gn.googlesource.com/gn arch = x86_64 @@ -16,7 +16,7 @@ pkgbase = gn-git source = gn::git+https://gn.googlesource.com/gn source = gcc-support.patch sha512sums = SKIP - sha512sums = 951cc9c43040fa8341e46e44390d9db654a504b3e1cce34a013806c59a29e28ab23cdb47518e96986ec12f8aa2f995da5beb44f981cada9eb9aebe6bc7621f1a + sha512sums = 33b8f6da50dc4989ea2f5b13d638a24d89f6847ddb0fad8845575c6f490a25ff2772aee15d1d83e57a1554dee3cd19e88d69823664099714e551d3edd9c56aa7 pkgname = gn-git diff --git a/.gitignore b/.gitignore index d01d40e6f62f..1e8a8e8e3a30 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /gn/ /pkg/ /src/ +/*.log /*.tar /*.tar.* @@ -3,7 +3,7 @@ # pkgname=gn-git pkgdesc='Meta-build system which generates Ninja build files' -pkgver=r1498.13ac6ca4 +pkgver=r1523.377ad041 pkgrel=1 license=('BSD') arch=('x86_64' 'i686') @@ -14,7 +14,7 @@ makedepends=('python2' 'ninja' 'git') url='https://gn.googlesource.com/gn' source=("gn::git+${url}" gcc-support.patch) sha512sums=('SKIP' - '951cc9c43040fa8341e46e44390d9db654a504b3e1cce34a013806c59a29e28ab23cdb47518e96986ec12f8aa2f995da5beb44f981cada9eb9aebe6bc7621f1a') + '33b8f6da50dc4989ea2f5b13d638a24d89f6847ddb0fad8845575c6f490a25ff2772aee15d1d83e57a1554dee3cd19e88d69823664099714e551d3edd9c56aa7') pkgver () { export GIT_DIR="${startdir}/gn" @@ -22,7 +22,8 @@ pkgver () { } prepare () { - patch -p1 < gcc-support.patch + cd gn + patch -p1 < "${srcdir}/gcc-support.patch" } build () { diff --git a/gcc-support.patch b/gcc-support.patch index 43db6676e29d..e1f0794abf6d 100644 --- a/gcc-support.patch +++ b/gcc-support.patch @@ -1,7 +1,18 @@ ---- src/gn/build/gen.py.orig 2018-07-21 16:28:08.909054488 +0200 -+++ src/gn/build/gen.py 2018-07-21 19:15:30.284412730 +0200 -@@ -308,8 +312,11 @@ - ldflags.append(min_mac_version_flag) +diff --git a/build/gen.py b/build/gen.py +index ee4f8e14..89714678 100755 +--- a/build/gen.py ++++ b/build/gen.py +@@ -299,7 +299,7 @@ def WriteGNNinja(path, platform, host, options): + ldflags.append('-Wl,-strip-all') + + # Enable identical code-folding. +- if not platform.is_darwin(): ++ if not platform.is_darwin() and "clang" in cc: + ldflags.append('-Wl,--icf=all') + + cflags.extend([ +@@ -332,8 +332,11 @@ def WriteGNNinja(path, platform, host, options): + ldflags.extend(['-maix64', '-pthread']) if options.use_lto: - cflags.extend(['-flto', '-fwhole-program-vtables']) @@ -12,5 +23,5 @@ + cflags.append('-fwhole-program-vtables') + ldflags.append('-fwhole-program-vtables') - elif is_win: + elif platform.is_msvc(): if not options.debug: |