summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Perez de Castro2020-01-02 18:13:33 +0200
committerAdrian Perez de Castro2020-01-02 18:13:33 +0200
commitd63d09a2bb7d71a720846f836268d4844dc5e9ec (patch)
tree0a88f5303f43fb1266f43cca19939c1d84dc1476
parent49c38e71540a4be24a1466b14cb25201e9cdae95 (diff)
downloadaur-gn-git.tar.gz
Fix build and installation of Vim files
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--gcc-support.patch2
3 files changed, 6 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4e36de0c3ef8..713e9de26bc9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = gn-git
pkgdesc = Meta-build system which generates Ninja build files
- pkgver = r1668.776bbfd9
+ pkgver = r1682.a5bcbd72
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
sha256sums = SKIP
- sha256sums = 5b7d79a6953f023109f0c23601ba9fbb8b63f50ebb6b185e32102c213a97d81a
+ sha256sums = f372f4d2129219d29d4c4adbade6a653059d376d8ecd8785a3bad2c0ac96f304
pkgname = gn-git
diff --git a/PKGBUILD b/PKGBUILD
index 3059bd44a73b..38d46f408f23 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=gn-git
pkgdesc='Meta-build system which generates Ninja build files'
-pkgver=r1668.776bbfd9
+pkgver=r1682.a5bcbd72
pkgrel=1
license=('BSD')
arch=('x86_64' 'i686')
@@ -14,7 +14,7 @@ makedepends=(python ninja git)
url='https://gn.googlesource.com/gn'
source=("gn::git+${url}" gcc-support.patch)
sha256sums=('SKIP'
- '5b7d79a6953f023109f0c23601ba9fbb8b63f50ebb6b185e32102c213a97d81a')
+ 'f372f4d2129219d29d4c4adbade6a653059d376d8ecd8785a3bad2c0ac96f304')
pkgver () {
export GIT_DIR="${startdir}/gn"
@@ -54,7 +54,7 @@ package () {
local item
for item in autoload ftplugin ftdetect syntax ; do
install -Dm 644 -t "${pkgdir}/usr/share/vim/vimfiles/${item}" \
- "gn/tools/gn/misc/vim/${item}"/*.vim
+ "gn/misc/vim/${item}"/*.vim
done
# License
diff --git a/gcc-support.patch b/gcc-support.patch
index 61d8737d7fac..124d2d92c724 100644
--- a/gcc-support.patch
+++ b/gcc-support.patch
@@ -10,7 +10,7 @@ index d2305c8f..811c2e95 100755
- ldflags.extend(['-flto', '-fwhole-program-vtables'])
+ cflags.append('-flto')
+ ldflags.append('-flto')
-+ if "clang" in cc:
++ if "clang" in cxx:
+ cflags.append('-fwhole-program-vtables')
+ ldflags.append('-fwhole-program-vtables')