From ebebf72e2608870d07945da5f012084dc3abae25 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 21 Aug 2022 16:05:44 +0300 Subject: [PATCH] re2: bump to 2022.06.01 (#7122) --- .../{re2-2019.09.01.patchset => re2-2022.06.01.patchset} | 6 +++--- .../re2/{re2-2019.09.01.recipe => re2-2022.06.01.recipe} | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) rename dev-libs/re2/patches/{re2-2019.09.01.patchset => re2-2022.06.01.patchset} (61%) rename dev-libs/re2/{re2-2019.09.01.recipe => re2-2022.06.01.recipe} (93%) diff --git a/dev-libs/re2/patches/re2-2019.09.01.patchset b/dev-libs/re2/patches/re2-2022.06.01.patchset similarity index 61% rename from dev-libs/re2/patches/re2-2019.09.01.patchset rename to dev-libs/re2/patches/re2-2022.06.01.patchset index 2a4c7dbac..a45916b98 100644 --- a/dev-libs/re2/patches/re2-2019.09.01.patchset +++ b/dev-libs/re2/patches/re2-2022.06.01.patchset @@ -8,13 +8,13 @@ diff --git a/Makefile b/Makefile index f001f06..b314658 100644 --- a/Makefile +++ b/Makefile -@@ -17,8 +17,8 @@ CXX?=g++ +@@ -17,8 +17,8 @@ CXXFLAGS?=-O3 -g LDFLAGS?= # required --RE2_CXXFLAGS?=-std=c++11 -pthread -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -I. $(CCICU) $(CCPCRE) +-RE2_CXXFLAGS?=-pthread -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -I. $(CCICU) $(CCPCRE) -RE2_LDFLAGS?=-pthread $(LDICU) $(LDPCRE) -+RE2_CXXFLAGS?=-std=c++11 -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -I. $(CCICU) $(CCPCRE) ++RE2_CXXFLAGS?=-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -I. $(CCICU) $(CCPCRE) +RE2_LDFLAGS?=$(LDICU) $(LDPCRE) AR?=ar ARFLAGS?=rsc diff --git a/dev-libs/re2/re2-2019.09.01.recipe b/dev-libs/re2/re2-2022.06.01.recipe similarity index 93% rename from dev-libs/re2/re2-2019.09.01.recipe rename to dev-libs/re2/re2-2022.06.01.recipe index e1af91751..08924ac26 100644 --- a/dev-libs/re2/re2-2019.09.01.recipe +++ b/dev-libs/re2/re2-2022.06.01.recipe @@ -5,10 +5,10 @@ C++ library." HOMEPAGE="https://github.com/google/re2" COPYRIGHT="2009-2018 The RE2 Authors" LICENSE="BSD (3-clause)" -REVISION="3" +REVISION="1" RE_VERSION="${portVersion//./-}" SOURCE_URI="https://github.com/google/re2/archive/$RE_VERSION.tar.gz" -CHECKSUM_SHA256="b0382aa7369f373a0148218f2df5a6afd6bfa884ce4da2dfb576b979989e615e" +CHECKSUM_SHA256="f89c61410a072e5cbcf8c27e3a778da7d6fd2f2b5b1445cd4f4508bee946ab0f" SOURCE_FILENAME="re2-$portVersion.tar.gz" SOURCE_DIR="re2-$RE_VERSION" PATCHES="re2-$portVersion.patchset" @@ -16,7 +16,7 @@ PATCHES="re2-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="0.0.0" +libVersion="9.0.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES="