Patch exprtk on Clang < 3.9

tresf · Nov 14, 2017 · 3d6b3e0 · 3d6b3e0
1 parent 231cc82
commit 3d6b3e0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/plugins/Xpressive/CMakeLists.txt b/plugins/Xpressive/CMakeLists.txt
@@ -10,6 +10,14 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dexprtk_disable_rtl_io_file")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dexprtk_disable_rtl_vecops")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WERROR_FLAGS} -fexceptions")
 
+# Clang < 3.9 bug
+IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+	IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "3.9")
+		EXECUTE_PROCESS(COMMAND patch exprtk/exprtk.hpp exprtk.hpp.patch
+		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_QUIET)
+	ENDIF()
+ENDIF()
+
 IF(LMMS_BUILD_WIN32)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa,-mbig-obj -Dexprtk_disable_enhanced_features")
 ENDIF()

diff --git a/plugins/Xpressive/exprtk.hpp.patch b/plugins/Xpressive/exprtk.hpp.patch
@@ -0,0 +1,13 @@
+diff --git a/exprtk.hpp b/exprtk.hpp
+index 916e74b..ae7de24 100644
+--- a/exprtk.hpp
++++ b/exprtk.hpp
+@@ -1962,7 +1962,7 @@ namespace exprtk
+       template <typename T>
+       inline bool string_to_real(const std::string& s, T& t)
+       {
+-         const typename numeric::details::number_type<T>::type num_type;
++         typename numeric::details::number_type<T>::type num_type;
+
+          const char_t* begin = s.data();
+          const char_t* end   = s.data() + s.size();