From 574379cc6e1a963b63b5f1bea688b9b7e681ccd4 Mon Sep 17 00:00:00 2001 From: AleaJactaEst Date: Thu, 14 Jun 2018 22:10:50 +0200 Subject: [PATCH] update patch for issue 39 build error on archlinux (allocator static_assert error) --- ...hlinux_allocator_static_assert_error.patch | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/patch/02_archlinux_allocator_static_assert_error.patch b/patch/02_archlinux_allocator_static_assert_error.patch index 69b286cec..13f0bc330 100644 --- a/patch/02_archlinux_allocator_static_assert_error.patch +++ b/patch/02_archlinux_allocator_static_assert_error.patch @@ -1,12 +1,15 @@ diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake -index 95b28bb8a..8c4871379 100644 +index 95b28bb8a..92d014836 100644 --- a/code/CMakeModules/nel.cmake +++ b/code/CMakeModules/nel.cmake -@@ -874,7 +874,7 @@ MACRO(NL_SETUP_BUILD) - ENDIF() - - # use c++0x standard to use std::unique_ptr and std::shared_ptr -- SET(PLATFORM_CXXFLAGS "${PLATFORM_CXXFLAGS} -std=c++0x") -+ SET(PLATFORM_CXXFLAGS "${PLATFORM_CXXFLAGS} -std=gnu++14") - - ADD_PLATFORM_FLAGS("-D_REENTRANT") +@@ -873,8 +873,8 @@ MACRO(NL_SETUP_BUILD) + ENDIF() + ENDIF() + +- # use c++0x standard to use std::unique_ptr and std::shared_ptr +- SET(PLATFORM_CXXFLAGS "${PLATFORM_CXXFLAGS} -std=c++0x") ++ # use gnu++14 standard to use std::unique_ptr and std::shared_ptr ++ SET(PLATFORM_CXXFLAGS "${PLATFORM_CXXFLAGS} -std=gnu++14") + + ADD_PLATFORM_FLAGS("-D_REENTRANT") +