Date: Tuesday, September 27, 2016 @ 23:10:13 Author: anatolik Revision: 190690
upgpkg: re2 20160901-1 Added: re2/trunk/gcc-61-fix.patch Modified: re2/trunk/PKGBUILD ------------------+ PKGBUILD | 17 +++++++++++------ gcc-61-fix.patch | 13 +++++++++++++ 2 files changed, 24 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-09-27 21:29:35 UTC (rev 190689) +++ PKGBUILD 2016-09-27 23:10:13 UTC (rev 190690) @@ -4,7 +4,7 @@ # Contributor: Alexandre Bique <bique.alexan...@gmail.com> pkgname=re2 -_tag='2016-03-01' +_tag='2016-09-01' pkgver=${_tag//-/} pkgrel=1 pkgdesc='C++ library for fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python' @@ -12,19 +12,24 @@ depends=(gcc-libs) arch=(i686 x86_64) license=(BSD) -source=(re2-$pkgver.zip::https://github.com/google/re2/archive/$_tag.zip) -sha1sums=('f66df774723add0b5bae23aef69ff64400d36365') +source=(re2-$pkgver.zip::https://github.com/google/re2/archive/$_tag.zip + gcc-61-fix.patch) +sha1sums=('fbde84ba1661ac4ff7dea657c01b0e69c1c26eb4' + 'd233c798c40dab4c9ba973316145715308df02f1') +prepare() { + cd re2-$_tag + # fix for https://github.com/google/re2/issues/102 + patch -p1 < ../gcc-61-fix.patch +} + build() { cd re2-$_tag - LDFLAGS+=" -pthread" - CXXFLAGS+=" -std=c++11" make prefix=/usr } check() { cd re2-$_tag - LDFLAGS+=" -pthread" make prefix=/usr test } Added: gcc-61-fix.patch =================================================================== --- gcc-61-fix.patch (rev 0) +++ gcc-61-fix.patch 2016-09-27 23:10:13 UTC (rev 190690) @@ -0,0 +1,13 @@ +diff --git a/re2/dfa.cc b/re2/dfa.cc +index 1fc8a5a..43dddac 100644 +--- a/re2/dfa.cc ++++ b/re2/dfa.cc +@@ -123,7 +123,7 @@ class DFA { + uint32_t flag_; // Empty string bitfield flags in effect on the way + // into this state, along with kFlagMatch if this + // is a matching state. +- std::atomic<State*> next_[]; // Outgoing arrows from State, ++ std::atomic<State*> next_[0]; // Outgoing arrows from State, + // one per input byte class + }; +