summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Robertson <dan@dlrobertson.com>2019-02-14 15:53:18 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2019-02-14 22:48:34 +0000
commitf999637bb609dbedac15dfca4a608e7bb199ce59 (patch)
tree2790279925dc4d82aeb886c62948087af6d1fc89
parentgames-emulation/dolphin: whitelist FreeSurround (diff)
downloadgentoo-f999637bb609dbedac15dfca4a608e7bb199ce59.tar.gz
gentoo-f999637bb609dbedac15dfca4a608e7bb199ce59.tar.bz2
gentoo-f999637bb609dbedac15dfca4a608e7bb199ce59.zip
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@dlrobertson.com> Closes: https://github.com/gentoo/gentoo/pull/11051 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-rw-r--r--dev-util/rr/files/rr-5.2.0-c++14.patch13
-rw-r--r--dev-util/rr/rr-5.2.0.ebuild1
2 files changed, 14 insertions, 0 deletions
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 000000000000..8458de5f1e9f
--- /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 8a48df5899c7..8c74d5929434 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() {