Merge pull request #18725 from boegel/20230906095020_new_pr_RapidJSON110

strip out hardcoded `-march=native` used by RapidJSON 1.1.0
easybuilders · Sep 6, 2023 · a82280d · a82280d
2 parents cfcee94 + 4282f2f
commit a82280d
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 0 deletions.
diff --git a/easybuild/easyconfigs/r/RapidJSON/RapidJSON-1.1.0-GCCcore-10.2.0.eb b/easybuild/easyconfigs/r/RapidJSON/RapidJSON-1.1.0-GCCcore-10.2.0.eb
@@ -22,6 +22,8 @@ builddependencies = [
     ('CMake', '3.18.4'),
 ]
 
+# strip out hardcoded use of -march=native, EasyBuild should be in control of this
+preconfigopts = "sed -i 's/-march=native//g' ../rapidjson-%(version)s/CMakeLists.txt && "
 
 sanity_check_paths = {
     'files': ['lib/pkgconfig/%(name)s.pc'],

diff --git a/easybuild/easyconfigs/r/RapidJSON/RapidJSON-1.1.0-GCCcore-10.3.0.eb b/easybuild/easyconfigs/r/RapidJSON/RapidJSON-1.1.0-GCCcore-10.3.0.eb
@@ -22,6 +22,9 @@ builddependencies = [
     ('CMake', '3.20.1'),
 ]
 
+# strip out hardcoded use of -march=native, EasyBuild should be in control of this
+preconfigopts = "sed -i 's/-march=native//g' ../rapidjson-%(version)s/CMakeLists.txt && "
+
 sanity_check_paths = {
     'files': ['lib/pkgconfig/%(name)s.pc'],
     'dirs': ['include/%(namelower)s', 'lib/cmake', 'share'],

diff --git a/easybuild/easyconfigs/r/RapidJSON/RapidJSON-1.1.0-GCCcore-11.2.0.eb b/easybuild/easyconfigs/r/RapidJSON/RapidJSON-1.1.0-GCCcore-11.2.0.eb
@@ -22,6 +22,9 @@ builddependencies = [
     ('CMake', '3.21.1'),
 ]
 
+# strip out hardcoded use of -march=native, EasyBuild should be in control of this
+preconfigopts = "sed -i 's/-march=native//g' ../rapidjson-%(version)s/CMakeLists.txt && "
+
 sanity_check_paths = {
     'files': ['lib/pkgconfig/%(name)s.pc'],
     'dirs': ['include/%(namelower)s', 'lib/cmake', 'share'],

diff --git a/easybuild/easyconfigs/r/RapidJSON/RapidJSON-1.1.0-GCCcore-11.3.0.eb b/easybuild/easyconfigs/r/RapidJSON/RapidJSON-1.1.0-GCCcore-11.3.0.eb
@@ -22,6 +22,9 @@ builddependencies = [
     ('CMake', '3.23.1'),
 ]
 
+# strip out hardcoded use of -march=native, EasyBuild should be in control of this
+preconfigopts = "sed -i 's/-march=native//g' ../rapidjson-%(version)s/CMakeLists.txt && "
+
 sanity_check_paths = {
     'files': ['lib/pkgconfig/%(name)s.pc'],
     'dirs': ['include/%(namelower)s', 'lib/cmake', 'share'],

diff --git a/easybuild/easyconfigs/r/RapidJSON/RapidJSON-1.1.0-GCCcore-12.2.0.eb b/easybuild/easyconfigs/r/RapidJSON/RapidJSON-1.1.0-GCCcore-12.2.0.eb
@@ -22,6 +22,9 @@ builddependencies = [
     ('CMake', '3.24.3'),
 ]
 
+# strip out hardcoded use of -march=native, EasyBuild should be in control of this
+preconfigopts = "sed -i 's/-march=native//g' ../rapidjson-%(version)s/CMakeLists.txt && "
+
 sanity_check_paths = {
     'files': ['lib/pkgconfig/%(name)s.pc'],
     'dirs': ['include/%(namelower)s', 'lib/cmake', 'share'],

diff --git a/easybuild/easyconfigs/r/RapidJSON/RapidJSON-1.1.0-GCCcore-8.2.0.eb b/easybuild/easyconfigs/r/RapidJSON/RapidJSON-1.1.0-GCCcore-8.2.0.eb
@@ -21,6 +21,9 @@ builddependencies = [
     ('CMake', '3.13.3'),
 ]
 
+# strip out hardcoded use of -march=native, EasyBuild should be in control of this
+preconfigopts = "sed -i 's/-march=native//g' ../rapidjson-%(version)s/CMakeLists.txt && "
+
 sanity_check_paths = {
     'files': ['lib/pkgconfig/RapidJSON.pc'],
     'dirs': ['include/rapidjson', 'lib/cmake', 'share'],

diff --git a/easybuild/easyconfigs/r/RapidJSON/RapidJSON-1.1.0-GCCcore-8.3.0.eb b/easybuild/easyconfigs/r/RapidJSON/RapidJSON-1.1.0-GCCcore-8.3.0.eb
@@ -21,6 +21,9 @@ builddependencies = [
     ('CMake', '3.15.3'),
 ]
 
+# strip out hardcoded use of -march=native, EasyBuild should be in control of this
+preconfigopts = "sed -i 's/-march=native//g' ../rapidjson-%(version)s/CMakeLists.txt && "
+
 sanity_check_paths = {
     'files': ['lib/pkgconfig/RapidJSON.pc'],
     'dirs': ['include/rapidjson', 'lib/cmake', 'share'],

diff --git a/easybuild/easyconfigs/r/RapidJSON/RapidJSON-1.1.0-GCCcore-9.3.0.eb b/easybuild/easyconfigs/r/RapidJSON/RapidJSON-1.1.0-GCCcore-9.3.0.eb
@@ -22,6 +22,8 @@ builddependencies = [
     ('CMake', '3.16.4'),
 ]
 
+# strip out hardcoded use of -march=native, EasyBuild should be in control of this
+preconfigopts = "sed -i 's/-march=native//g' ../rapidjson-%(version)s/CMakeLists.txt && "
 
 sanity_check_paths = {
     'files': ['lib/pkgconfig/%(name)s.pc'],