diff options
| author | Alexandre Macabies | 2019-11-16 16:30:56 +0100 |
|---|---|---|
| committer | Alexandre Macabies | 2019-11-16 16:30:56 +0100 |
| commit | 49c38e71540a4be24a1466b14cb25201e9cdae95 (patch) | |
| tree | 600e6c516a102ab5b6006c17f008efbdd737e272 | |
| parent | f4a8aa5a1836cdd079ee101eca7defe11c3d72ab (diff) | |
| download | aur-49c38e71540a4be24a1466b14cb25201e9cdae95.tar.gz | |
Fix gcc-support patch not applying.
I'm not sure this patch is still relevant, but at least the package builds
now.
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | gcc-support.patch | 26 |
3 files changed, 20 insertions, 20 deletions
@@ -1,6 +1,6 @@ pkgbase = gn-git pkgdesc = Meta-build system which generates Ninja build files - pkgver = r1642.546edf82 + pkgver = r1668.776bbfd9 pkgrel = 1 url = https://gn.googlesource.com/gn arch = x86_64 @@ -15,8 +15,8 @@ pkgbase = gn-git conflicts = gn source = gn::git+https://gn.googlesource.com/gn source = gcc-support.patch - sha512sums = SKIP - sha512sums = fe2576ac88859494f7829de8b4fec1dc87ba9a418ac5b80028dea52471ffdfb65570728f5b2e8a9328d404394e6e22a5ebfd3765660e27324918f7a23fea3854 + sha256sums = SKIP + sha256sums = 5b7d79a6953f023109f0c23601ba9fbb8b63f50ebb6b185e32102c213a97d81a pkgname = gn-git @@ -1,9 +1,9 @@ # Maintainer: Adrián Pérez de Castro <aperez@igalia.com> # Maintainer: Alexandre Macabies <web+oss@zopieux.com> -# + pkgname=gn-git pkgdesc='Meta-build system which generates Ninja build files' -pkgver=r1642.546edf82 +pkgver=r1668.776bbfd9 pkgrel=1 license=('BSD') arch=('x86_64' 'i686') @@ -13,8 +13,8 @@ depends=(gcc-libs) makedepends=(python ninja git) url='https://gn.googlesource.com/gn' source=("gn::git+${url}" gcc-support.patch) -sha512sums=('SKIP' - 'fe2576ac88859494f7829de8b4fec1dc87ba9a418ac5b80028dea52471ffdfb65570728f5b2e8a9328d404394e6e22a5ebfd3765660e27324918f7a23fea3854') +sha256sums=('SKIP' + '5b7d79a6953f023109f0c23601ba9fbb8b63f50ebb6b185e32102c213a97d81a') pkgver () { export GIT_DIR="${startdir}/gn" diff --git a/gcc-support.patch b/gcc-support.patch index c4260b44c647..61d8737d7fac 100644 --- a/gcc-support.patch +++ b/gcc-support.patch @@ -1,18 +1,18 @@ diff --git a/build/gen.py b/build/gen.py -index ee4f8e14..89714678 100755 +index d2305c8f..811c2e95 100755 --- a/build/gen.py +++ b/build/gen.py -@@ -332,8 +332,11 @@ def WriteGNNinja(path, platform, host, options): - ldflags.extend(['-maix64', '-pthread']) +@@ -324,8 +324,11 @@ def WriteGNNinja(path, platform, host, options): + ldflags.append('-Wl,--icf=all') - if options.use_lto: -- cflags.extend(['-flto', '-fwhole-program-vtables']) -- ldflags.extend(['-flto', '-fwhole-program-vtables']) -+ cflags.append('-flto') -+ ldflags.append('-flto') -+ if "clang" in cc: -+ cflags.append('-fwhole-program-vtables') -+ ldflags.append('-fwhole-program-vtables') + if options.use_lto: +- cflags.extend(['-flto', '-fwhole-program-vtables']) +- ldflags.extend(['-flto', '-fwhole-program-vtables']) ++ cflags.append('-flto') ++ ldflags.append('-flto') ++ if "clang" in cc: ++ cflags.append('-fwhole-program-vtables') ++ ldflags.append('-fwhole-program-vtables') - elif platform.is_msvc(): - if not options.debug: + cflags.extend([ + '-D_FILE_OFFSET_BITS=64', |