[checkmk-commits] Updated RE2 to 2018-10-01.

Module: check_mk Branch: master Commit: 036c437f79cb0c9ff7cc464236258085c6b98155 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=036c437f79cb0c… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Thu Oct 18 08:34:43 2018 +0200 Updated RE2 to 2018-10-01. Change-Id: Ida57788f0ae225f0eaf7137d770031edd6ab560b --- omd/packages/re2/Makefile | 6 +--- ...-Use-fallthrough-attribute-when-available.patch | 33 --------------------- omd/packages/re2/re2-2018-02-01.tar.gz | Bin 388937 -> 0 bytes omd/packages/re2/re2-2018-10-01.tar.gz | Bin 0 -> 391254 bytes 4 files changed, 1 insertion(+), 38 deletions(-) diff --git a/omd/packages/re2/Makefile b/omd/packages/re2/Makefile index 7665be9..47e457c 100644 --- a/omd/packages/re2/Makefile +++ b/omd/packages/re2/Makefile @@ -4,7 +4,7 @@ include ../../Makefile.omd # principle we could use any tag by exporting it manually via: # ( TAG=2018-02-01; git archive --prefix=re2-$TAG/ --output=re2-$TAG.tar.gz $TAG ) NAME = re2 -VERSION = 2018-02-01 +VERSION = 2018-10-01 DIR = $(NAME)-$(VERSION) .PHONY: build unpacks install skel clean @@ -36,10 +36,6 @@ build: unpack unpack: tar xzf $(DIR).tar.gz - for p in patches/*.patch; do \ - echo "applying $$p..." ; \ - patch -p1 -b -d $(DIR) < $$p ; \ - done install: diff --git a/omd/packages/re2/patches/0001-Use-fallthrough-attribute-when-available.patch b/omd/packages/re2/patches/0001-Use-fallthrough-attribute-when-available.patch deleted file mode 100644 index 8fa9726..0000000 --- a/omd/packages/re2/patches/0001-Use-fallthrough-attribute-when-available.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ef0b0e0bde7bb50b6b5d6144a53869bfc2416597 Mon Sep 17 00:00:00 2001 -From: Sven Panne &lt;sp(a)mathias-kettner.de&gt; -Date: Fri, 9 Feb 2018 15:12:37 +0100 -Subject: [PATCH] Use fallthrough attribute when available. - ---- - util/util.h | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/util/util.h b/util/util.h -index a69d842..9f8216b 100644 ---- a/util/util.h -+++ b/util/util.h -@@ -11,6 +11,16 @@ using std::string; - - #define arraysize(array) (int)(sizeof(array)/sizeof((array)[0])) - -+#if !defined(FALLTHROUGH_INTENDED) && defined(__has_cpp_attribute) -+#if __has_cpp_attribute(fallthrough) -+#define FALLTHROUGH_INTENDED [[fallthrough]] -+#elif __has_cpp_attribute(gnu::fallthrough) -+#define FALLTHROUGH_INTENDED [[gnu::fallthrough]] -+#elif __has_cpp_attribute(clang::fallthrough) -+#define FALLTHROUGH_INTENDED [[clang::fallthrough]] -+#endif -+#endif -+ - #ifndef FALLTHROUGH_INTENDED - #define FALLTHROUGH_INTENDED do { } while (0) - #endif --- -2.14.1 - diff --git a/omd/packages/re2/re2-2018-02-01.tar.gz b/omd/packages/re2/re2-2018-02-01.tar.gz deleted file mode 100644 index 56b642d..0000000 Binary files a/omd/packages/re2/re2-2018-02-01.tar.gz and /dev/null differ diff --git a/omd/packages/re2/re2-2018-10-01.tar.gz b/omd/packages/re2/re2-2018-10-01.tar.gz new file mode 100644 index 0000000..215a0e9 Binary files /dev/null and b/omd/packages/re2/re2-2018-10-01.tar.gz differ