From 3e853d1b0a43e1f7dd87185ebe1b7dcf93680245 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Apr 26 2021 22:26:35 +0000 Subject: Update to snapshot from 20210420 Signed-off-by: Michel Alexandre Salim --- diff --git a/.gitignore b/.gitignore index d5b2490..76e97d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wdt-fdbc5432230290f86ff8ad89ab52d5b7fef232b4.tar.gz +/wdt-0f100c6f38220378fcfbc672b007f4272c416a03.tar.gz diff --git a/sources b/sources index 3628ce5..93bc80e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wdt-fdbc5432230290f86ff8ad89ab52d5b7fef232b4.tar.gz) = 61f1d4650ef230f476d19f749487203e5f45bb656018a472df3f5826d3f0bbbd91bcc1497c8a719225359245d1dcb84cc58176130e8bd3b2fe92f41799abda68 +SHA512 (wdt-0f100c6f38220378fcfbc672b007f4272c416a03.tar.gz) = bce0c175a0807d79d51367402837f84452106ff990fc346a99f2f0cb0b10c05abc179ad1b4f9d4bb33abef0f719eea330f710572d1a78162c70d5c3fdc269292 diff --git a/wdt-require_cxx17.patch b/wdt-require_cxx17.patch deleted file mode 100644 index 3fcf9fd..0000000 --- a/wdt-require_cxx17.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- wdt-fdbc5432230290f86ff8ad89ab52d5b7fef232b4/CMakeLists.txt.cxx17 2021-03-31 21:41:57.000000000 -0700 -+++ wdt-fdbc5432230290f86ff8ad89ab52d5b7fef232b4/CMakeLists.txt 2021-04-16 21:40:00.615974441 -0700 -@@ -24,11 +24,8 @@ - # Minor currently is also the protocol version - has to match with Protocol.cpp - project("WDT" LANGUAGES C CXX VERSION 1.32.1910230) - --# On MacOS this requires the latest (master) CMake (and/or CMake 3.1.1/3.2) --# WDT itself works fine with C++11 (gcc 4.8 for instance) but more recent folly --# started to require C++14, so you can either get an older snapshot of folly --# and set "11" below or use this: --set(CMAKE_CXX_STANDARD 14) -+# WDT uses C++17 features per fdbc5432230290f86ff8ad89ab52d5b7fef232b4 -+set(CMAKE_CXX_STANDARD 17) - set(CMAKE_CXX_STANDARD_REQUIRED on) - - # somehow 'option' for this doesn't seeem to work/I don't know how to make it diff --git a/wdt.spec b/wdt.spec index f34437c..49726f3 100644 --- a/wdt.spec +++ b/wdt.spec @@ -4,9 +4,9 @@ %bcond_with tests # last tagged release is from 2016 despite ongoing development -%global commit fdbc5432230290f86ff8ad89ab52d5b7fef232b4 +%global commit 0f100c6f38220378fcfbc672b007f4272c416a03 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global date 20210331 +%global date 20210420 %global _shared_builddir shared_build %global _static_builddir static_build @@ -19,8 +19,6 @@ Summary: Warp speed Data Transfer License: BSD URL: https://www.facebook.com/WdtOpenSource Source0: https://github.com/facebook/wdt/archive/%{commit}/%{name}-%{commit}.tar.gz -# WDT uses C++17 features starting with fdbc5432230290f86ff8ad89ab52d5b7fef232b4 -Patch0: wdt-require_cxx17.patch BuildRequires: gcc-c++ BuildRequires: cmake @@ -82,9 +80,6 @@ developing applications that use %{name}. # wdt needs to be build from a base directory called wdt # https://github.com/facebook/wdt/issues/213 ln -s %{name}-%{commit} %{name} -pushd %{name} >/dev/null -%patch0 -p1 -popd >/dev/null # Disable hardcoded CXX FLAGS sed -i -e 's/set(CMAKE_CXX_FLAGS.*//' %{name}/CMakeLists.txt @@ -164,6 +159,9 @@ popd %endif %changelog +* Mon Apr 26 2021 Michel Alexandre Salim - 1.32.1910230-5.20210420git0f100c6 +- Update to snapshot from 20210420 + * Fri Apr 16 2021 Michel Alexandre Salim - 1.32.1910230-5.20210331gitfdbc543 - Update to snapshot from 20210331