commit:     f999637bb609dbedac15dfca4a608e7bb199ce59
Author:     Dan Robertson <dan <AT> dlrobertson <DOT> com>
AuthorDate: Thu Feb 14 15:53:18 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 22:48:34 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f999637b

dev-util/rr: enable c++14 to fix compilation

dev-util/rr-5.2.0 fails to compile if c++14 is not enabled. Add a patch
that ensures that c++14 is enabled

Signed-off-by: Dan Robertson <dan <AT> dlrobertson.com>
Closes: https://github.com/gentoo/gentoo/pull/11051
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-util/rr/files/rr-5.2.0-c++14.patch | 13 +++++++++++++
 dev-util/rr/rr-5.2.0.ebuild            |  1 +
 2 files changed, 14 insertions(+)

diff --git a/dev-util/rr/files/rr-5.2.0-c++14.patch 
b/dev-util/rr/files/rr-5.2.0-c++14.patch
new file mode 100644
index 00000000000..8458de5f1e9
--- /dev/null
+++ b/dev-util/rr/files/rr-5.2.0-c++14.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0d711f9..756a62e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,7 +42,7 @@ set(FLAGS_COMMON "-msse2 -D__MMX__ -D__SSE__ -D__SSE2__ 
-D__USE_LARGEFILE64 -pth
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAGS_COMMON} -Wstrict-prototypes 
-std=gnu11")
+ # Define __STDC_LIMIT_MACROS so |#include <stdint.h>| works as expected.
+ # Define __STDC_FORMAT_MACROS so |#include <inttypes.h>| works as expected.
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS_COMMON} -D__STDC_LIMIT_MACROS 
-D__STDC_FORMAT_MACROS -std=c++11")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS_COMMON} -D__STDC_LIMIT_MACROS 
-D__STDC_FORMAT_MACROS -std=c++14")
+ set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -g3")
+ 
+ set(RR_FLAGS_DEBUG "-Wall -Wextra  -O0 -DDEBUG -UNDEBUG")

diff --git a/dev-util/rr/rr-5.2.0.ebuild b/dev-util/rr/rr-5.2.0.ebuild
index 8a48df5899c..8c74d592943 100644
--- a/dev-util/rr/rr-5.2.0.ebuild
+++ b/dev-util/rr/rr-5.2.0.ebuild
@@ -33,6 +33,7 @@ DEPEND+="
 
 PATCHES=(
        "${FILESDIR}"/${P}-ucontext_t.patch
+       "${FILESDIR}"/${P}-c++14.patch
 )
 
 pkg_setup() {

Reply via email to