Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/rr/files/, dev-util/rr/
Date: Thu, 14 Feb 2019 22:49:12
Message-Id: 1550184514.f999637bb609dbedac15dfca4a608e7bb199ce59.slyfox@gentoo
1 commit: f999637bb609dbedac15dfca4a608e7bb199ce59
2 Author: Dan Robertson <dan <AT> dlrobertson <DOT> com>
3 AuthorDate: Thu Feb 14 15:53:18 2019 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 14 22:48:34 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f999637b
7
8 dev-util/rr: enable c++14 to fix compilation
9
10 dev-util/rr-5.2.0 fails to compile if c++14 is not enabled. Add a patch
11 that ensures that c++14 is enabled
12
13 Signed-off-by: Dan Robertson <dan <AT> dlrobertson.com>
14 Closes: https://github.com/gentoo/gentoo/pull/11051
15 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
16
17 dev-util/rr/files/rr-5.2.0-c++14.patch | 13 +++++++++++++
18 dev-util/rr/rr-5.2.0.ebuild | 1 +
19 2 files changed, 14 insertions(+)
20
21 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
22 new file mode 100644
23 index 00000000000..8458de5f1e9
24 --- /dev/null
25 +++ b/dev-util/rr/files/rr-5.2.0-c++14.patch
26 @@ -0,0 +1,13 @@
27 +diff --git a/CMakeLists.txt b/CMakeLists.txt
28 +index 0d711f9..756a62e 100644
29 +--- a/CMakeLists.txt
30 ++++ b/CMakeLists.txt
31 +@@ -42,7 +42,7 @@ set(FLAGS_COMMON "-msse2 -D__MMX__ -D__SSE__ -D__SSE2__ -D__USE_LARGEFILE64 -pth
32 + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAGS_COMMON} -Wstrict-prototypes -std=gnu11")
33 + # Define __STDC_LIMIT_MACROS so |#include <stdint.h>| works as expected.
34 + # Define __STDC_FORMAT_MACROS so |#include <inttypes.h>| works as expected.
35 +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS_COMMON} -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS -std=c++11")
36 ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS_COMMON} -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS -std=c++14")
37 + set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -g3")
38 +
39 + set(RR_FLAGS_DEBUG "-Wall -Wextra -O0 -DDEBUG -UNDEBUG")
40
41 diff --git a/dev-util/rr/rr-5.2.0.ebuild b/dev-util/rr/rr-5.2.0.ebuild
42 index 8a48df5899c..8c74d592943 100644
43 --- a/dev-util/rr/rr-5.2.0.ebuild
44 +++ b/dev-util/rr/rr-5.2.0.ebuild
45 @@ -33,6 +33,7 @@ DEPEND+="
46
47 PATCHES=(
48 "${FILESDIR}"/${P}-ucontext_t.patch
49 + "${FILESDIR}"/${P}-c++14.patch
50 )
51
52 pkg_setup() {