[arch-commits] Commit in re2/trunk (PKGBUILD gcc-61-fix.patch)

Anatol Pomozov anatolik at archlinux.org
Wed Jan 25 13:24:32 UTC 2017


    Date: Wednesday, January 25, 2017 @ 13:24:32
  Author: anatolik
Revision: 287422

upgpkg: re2 20170101-1

Modified:
  re2/trunk/PKGBUILD
Deleted:
  re2/trunk/gcc-61-fix.patch

------------------+
 PKGBUILD         |   14 +++-----------
 gcc-61-fix.patch |   13 -------------
 2 files changed, 3 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-25 12:50:57 UTC (rev 287421)
+++ PKGBUILD	2017-01-25 13:24:32 UTC (rev 287422)
@@ -4,7 +4,7 @@
 # Contributor: Alexandre Bique <bique.alexandre at gmail.com>
 
 pkgname=re2
-_tag='2016-09-01'
+_tag='2017-01-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,17 +12,9 @@
 depends=(gcc-libs)
 arch=(i686 x86_64)
 license=(BSD)
-source=(re2-$pkgver.zip::https://github.com/google/re2/archive/$_tag.zip
-        gcc-61-fix.patch)
-sha1sums=('fbde84ba1661ac4ff7dea657c01b0e69c1c26eb4'
-          'd233c798c40dab4c9ba973316145715308df02f1')
+source=(re2-$pkgver.zip::https://github.com/google/re2/archive/$_tag.zip)
+sha1sums=('0c19ad0370af8a6dcff73e714c7f21363dc709db')
 
-prepare() {
-  cd re2-$_tag
-  # fix for https://github.com/google/re2/issues/102
-  patch -p1 < ../gcc-61-fix.patch
-}
-
 build() {
   cd re2-$_tag
   make prefix=/usr

Deleted: gcc-61-fix.patch
===================================================================
--- gcc-61-fix.patch	2017-01-25 12:50:57 UTC (rev 287421)
+++ gcc-61-fix.patch	2017-01-25 13:24:32 UTC (rev 287422)
@@ -1,13 +0,0 @@
-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
-   };
- 



More information about the arch-commits mailing list