diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | gn-gen-r1.patch | 43 |
3 files changed, 50 insertions, 15 deletions
@@ -1,6 +1,6 @@ pkgbase = gn-chromium pkgdesc = Meta-build system which generates Ninja build files - pkgver = r1446.5d9a4e9a + pkgver = r1454.499868c6 pkgrel = 1 url = https://gn.googlesource.com/gn arch = x86_64 @@ -15,10 +15,10 @@ pkgbase = gn-chromium conflicts = gn-bin noextract = clang-337439-1.tgz source = gn::git+https://gn.googlesource.com/gn - source = https://raw.githubusercontent.com/gentoo/gentoo/master/dev-util/gn/files/gn-gen-r0.patch + source = gn-gen-r1.patch source = https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/clang-337439-1.tgz sha512sums = SKIP - sha512sums = 0e281be477d235a15ffc483fa6af03db560bc421392d7c82322c7735c0498ca3e6ea69843ed46bfe7bc562539488c5b6d945e508e66b530d97584e08e154d6d7 + sha512sums = a4da00a35e32905f9bcc6c63384baeaaaccdb4ae4286f8ecdb170277c5fcdd86ad3c101ea2d8fdb11fa3446874b3b14c1e5197df6fbc7c104029ee94762bcf82 sha512sums = 43c4d937b260a2da61e559d158fef9f8e1c3e556ed220d24c4901a8bdd00a50c230027043f434f83167d25e24f31acd443d2c545ec1f060b29d5227b8570325c pkgname = gn-chromium @@ -3,7 +3,7 @@ # pkgname=gn-chromium pkgdesc='Meta-build system which generates Ninja build files' -pkgver=r1446.5d9a4e9a +pkgver=r1454.499868c6 cl=337439 cl2=1 pkgrel=1 @@ -14,9 +14,9 @@ provides=('gn') depends=('python2' 'wget' 'p7zip') makedepends=('python2' 'ninja') url='https://gn.googlesource.com/gn' -source=("gn::git+${url}" https://raw.githubusercontent.com/gentoo/gentoo/master/dev-util/gn/files/gn-gen-r0.patch https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/clang-$cl-$cl2.tgz) +source=("gn::git+${url}" gn-gen-r1.patch https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/clang-$cl-$cl2.tgz) sha512sums=('SKIP' - '0e281be477d235a15ffc483fa6af03db560bc421392d7c82322c7735c0498ca3e6ea69843ed46bfe7bc562539488c5b6d945e508e66b530d97584e08e154d6d7' + 'a4da00a35e32905f9bcc6c63384baeaaaccdb4ae4286f8ecdb170277c5fcdd86ad3c101ea2d8fdb11fa3446874b3b14c1e5197df6fbc7c104029ee94762bcf82' '43c4d937b260a2da61e559d158fef9f8e1c3e556ed220d24c4901a8bdd00a50c230027043f434f83167d25e24f31acd443d2c545ec1f060b29d5227b8570325c') noextract=('clang-337439-1.tgz') pkgver () { @@ -30,7 +30,7 @@ cp clang-337439-1.tgz c7/ cd c7 tar -xvzf clang-337439-1.tgz cd ../gn - patch -p1 -i ../gn-gen-r0.patch + patch -p1 -i ../gn-gen-r1.patch } build () { @@ -59,14 +59,6 @@ package () { install -Dm755 gn/out/gn "${pkgdir}/usr/bin/gn" # Documentation - install -Dm644 -t "${pkgdir}/usr/share/doc/${pkgname}" \ - gn/tools/gn/docs/*.md - - install -Dm644 -t "${pkgdir}/usr/share/doc/${pkgname}/example" \ - gn/tools/gn/example/*.* - install -Dm644 -t "${pkgdir}/usr/share/doc/${pkgname}/example/build" \ - gn/tools/gn/example/build/*.* - # Vim support local item for item in autoload ftplugin ftdetect syntax ; do diff --git a/gn-gen-r1.patch b/gn-gen-r1.patch new file mode 100644 index 000000000000..524d8f316b4a --- /dev/null +++ b/gn-gen-r1.patch @@ -0,0 +1,43 @@ +diff --git a/build/gen.py b/build/gen.py +index fce8fb18..2927da5f 100755 +--- a/build/gen.py ++++ b/build/gen.py +@@ -267,9 +267,6 @@ + if options.debug: + cflags.extend(['-O0', '-g']) + else: +- cflags.append('-DNDEBUG') +- cflags.append('-O3') +- ldflags.append('-O3') + # Use -fdata-sections and -ffunction-sections to place each function + # or data item into its own section so --gc-sections can eliminate any + # unused functions and data items. +@@ -279,11 +274,11 @@ def WriteGNNinja(path, options, linux_sysroot): + '-D_FILE_OFFSET_BITS=64', + '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS', + '-pthread', +- '-pipe', + '-fno-exceptions', + '-fno-rtti', + ]) + cflags_cc.extend(['-std=c++14', '-Wno-c++11-narrowing']) ++ ldflags.append('-pthread') + + if is_linux: + if linux_sysroot: +@@ -293,15 +288,6 @@ def WriteGNNinja(path, options, linux_sysroot): + # probably resolve this and (re-)add a way to build against libc++. + cflags.append('--sysroot=' + linux_sysroot) + ldflags.append('--sysroot=' + linux_sysroot) +- cflags.append('-stdlib=libstdc++') +- ldflags.extend(['-static-libstdc++', +- '-stdlib=libstdc++', +- '-Wl,--as-needed', +- ]) +- libs.extend([ +- '-lgcc_s', +- '-lpthread', +- ]) + elif is_mac: + min_mac_version_flag = '-mmacosx-version-min=10.9' + cflags.append(min_mac_version_flag) |