diff options
| author | Joseph Wang <joequant@gmail.com> | 2024-09-01 23:01:53 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-01 10:01:53 -0500 |
| commit | fd98ebed9d5f095f2b2682a54161592648615139 (patch) | |
| tree | 26788221621b6e60c6f76c1864883fc2138f71cd | |
| parent | f7de621d0c1d4524c3dde8baee204fb8864c1ecd (diff) | |
| download | spack-fd98ebed9d5f095f2b2682a54161592648615139.tar.gz spack-fd98ebed9d5f095f2b2682a54161592648615139.tar.bz2 spack-fd98ebed9d5f095f2b2682a54161592648615139.tar.xz spack-fd98ebed9d5f095f2b2682a54161592648615139.zip | |
add rapidjson conflict for gcc14 (#46007)
| -rw-r--r-- | var/spack/repos/builtin/packages/rapidjson/no_march-1.2-2024.patch | 38 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/rapidjson/package.py | 6 |
2 files changed, 43 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/rapidjson/no_march-1.2-2024.patch b/var/spack/repos/builtin/packages/rapidjson/no_march-1.2-2024.patch new file mode 100644 index 0000000000..e2f1e1a07c --- /dev/null +++ b/var/spack/repos/builtin/packages/rapidjson/no_march-1.2-2024.patch @@ -0,0 +1,38 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1b3a79de..2d165f45 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -70,15 +70,7 @@ endif(CCACHE_FOUND) + find_program(VALGRIND_FOUND valgrind) + + if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +- if(RAPIDJSON_ENABLE_INSTRUMENTATION_OPT AND NOT CMAKE_CROSSCOMPILING) +- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native") +- else() +- #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER. +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") +- endif() +- endif() +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra") + set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wsign-conversion) + if (RAPIDJSON_BUILD_CXX11 AND CMAKE_VERSION VERSION_LESS 3.1) + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7.0") +@@ -106,15 +98,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + endif() + endif() + elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- if(NOT CMAKE_CROSSCOMPILING) +- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native") +- else() +- #FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER. +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") +- endif() +- endif() +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wno-missing-field-initializers") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-missing-field-initializers") + set(EXTRA_CXX_FLAGS -Weffc++ -Wswitch-default -Wfloat-equal -Wconversion -Wimplicit-fallthrough) + if (RAPIDJSON_BUILD_CXX11 AND CMAKE_VERSION VERSION_LESS 3.1) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") diff --git a/var/spack/repos/builtin/packages/rapidjson/package.py b/var/spack/repos/builtin/packages/rapidjson/package.py index a60a8525e1..bfa9573ae7 100644 --- a/var/spack/repos/builtin/packages/rapidjson/package.py +++ b/var/spack/repos/builtin/packages/rapidjson/package.py @@ -15,6 +15,7 @@ class Rapidjson(CMakePackage): license("MIT") + version("1.2.0-2024-08-16", commit="7c73dd7de7c4f14379b781418c6e947ad464c818") version("1.2.0-2022-03-09", commit="8261c1ddf43f10de00fd8c9a67811d1486b2c784") version("1.2.0-2021-08-13", commit="00dbcf2c6e03c47d6c399338b6de060c71356464") version("1.1.0", sha256="bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e") @@ -31,10 +32,13 @@ class Rapidjson(CMakePackage): # -march=native causes issues on ARM, with older GCC, and with Fujitsu # Spack injects the appropriate optimization flags anyway # https://github.com/Tencent/rapidjson/issues/1816 - patch("no_march-1.2.patch", when="@1.2") + patch("no_march-1.2-2024.patch", when="@1.2.0-2024-08-16:") + patch("no_march-1.2.patch", when="@1.2:1.2.0-2022-03-09") patch("no_march-1.1.patch", when="@1.1") patch("no_march-1.0.patch", when="@1.0") + conflicts("%gcc@14", when="@:1.2.0-2022-03-09") + def cmake_args(self): args = [] args.append(self.define_from_variant("RAPIDJSON_BUILD_DOC", "doc")) |