From 6be828d56346567ae9b7633ac7dac6283b3f1057 Mon Sep 17 00:00:00 2001 From: Ivan Yossi Date: Wed, 13 Jan 2021 13:54:47 -0600 Subject: [PATCH] Fix GSL build for clang 12.0.0 --- 3rdparty/ext_gsl/CMakeLists.txt | 1 + 3rdparty/ext_gsl/gsl-2.3_clang12.patch | 64 ++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 3rdparty/ext_gsl/gsl-2.3_clang12.patch diff --git a/3rdparty/ext_gsl/CMakeLists.txt b/3rdparty/ext_gsl/CMakeLists.txt index 57eb443d34..7afe760880 100644 --- a/3rdparty/ext_gsl/CMakeLists.txt +++ b/3rdparty/ext_gsl/CMakeLists.txt @@ -10,6 +10,7 @@ ExternalProject_Add( ext_gsl URL_MD5 7e0478f7c5e62696fef480b9a46f708c PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/gsl-android.patch + COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/gsl-2.3_clang12.patch INSTALL_DIR ${EXTPREFIX_gsl} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_gsl} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=OFF UPDATE_COMMAND "" diff --git a/3rdparty/ext_gsl/gsl-2.3_clang12.patch b/3rdparty/ext_gsl/gsl-2.3_clang12.patch new file mode 100644 index 0000000000..f13483b8eb --- /dev/null +++ b/3rdparty/ext_gsl/gsl-2.3_clang12.patch @@ -0,0 +1,64 @@ +diff --git a/matrix/test_complex_source.c b/matrix/test_complex_source.c +index 5f480ff..a3958e3 100644 +--- a/matrix/test_complex_source.c ++++ b/matrix/test_complex_source.c +@@ -17,6 +17,8 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#include ++ + void FUNCTION (test, func) (const size_t M, const size_t N); + void FUNCTION (test, ops) (const size_t P, const size_t Q); + void FUNCTION (test, trap) (const size_t M, const size_t N); +diff --git a/matrix/test_source.c b/matrix/test_source.c +index 5f5f26d..dd1b727 100644 +--- a/matrix/test_source.c ++++ b/matrix/test_source.c +@@ -17,6 +17,8 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#include ++ + void FUNCTION (test, func) (const size_t M, const size_t N); + void FUNCTION (test, ops) (const size_t M, const size_t N); + void FUNCTION (test, trap) (const size_t M, const size_t N); +diff --git a/spmatrix/test.c b/spmatrix/test.c +index 08e0f67..3d7811e 100644 +--- a/spmatrix/test.c ++++ b/spmatrix/test.c +@@ -17,6 +17,7 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#include + #include + #include + #include +diff --git a/vector/test_complex_source.c b/vector/test_complex_source.c +index c48d631..79a8fda 100644 +--- a/vector/test_complex_source.c ++++ b/vector/test_complex_source.c +@@ -17,6 +17,8 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#include ++ + void FUNCTION (test, func) (size_t stride, size_t N); + void FUNCTION (test, ops) (size_t stride1, size_t stride2, size_t N); + void FUNCTION (test, file) (size_t stride, size_t N); +diff --git a/vector/test_source.c b/vector/test_source.c +index 2a80266..03fc46a 100644 +--- a/vector/test_source.c ++++ b/vector/test_source.c +@@ -17,6 +17,8 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#include ++ + void FUNCTION (test, func) (size_t stride, size_t N); + void FUNCTION (test, ops) (size_t stride1, size_t stride2, size_t N); + void FUNCTION (test, file) (size_t stride, size_t N); -- GitLab