From 1819c2bb804574dc4d47ce07995476967225ca82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Thu, 28 Mar 2024 10:58:27 +0100
Subject: [PATCH] add -flax-vector-conversions to dbarts compiler flags when
 building for Arm CPUs

---
 easybuild/easyconfigs/r/R/R-4.2.0-foss-2021b.eb | 9 +++++++++
 easybuild/easyconfigs/r/R/R-4.2.1-foss-2022a.eb | 9 +++++++++
 easybuild/easyconfigs/r/R/R-4.2.2-foss-2022b.eb | 9 +++++++++
 3 files changed, 27 insertions(+)

diff --git a/easybuild/easyconfigs/r/R/R-4.2.0-foss-2021b.eb b/easybuild/easyconfigs/r/R/R-4.2.0-foss-2021b.eb
index e1cfa939335..33973d12812 100644
--- a/easybuild/easyconfigs/r/R/R-4.2.0-foss-2021b.eb
+++ b/easybuild/easyconfigs/r/R/R-4.2.0-foss-2021b.eb
@@ -78,6 +78,14 @@ exts_default_options = {
     'source_tmpl': '%(name)s_%(version)s.tar.gz',
 }
 
+# the dbarts extension needs an additional compiler flag on Arm systems to prevent "incompatible types" errors
+# cfr. https://github.com/vdorie/dbarts/issues/66
+if ARCH == 'aarch64':
+    local_dbarts_preinstallopts = 'sed -i "s|-c partition_neon.c|-flax-vector-conversions -c partition_neon.c|"'
+    local_dbarts_preinstallopts += ' src/misc/Makefile && '
+else:
+    local_dbarts_preinstallopts = ''
+
 # !! order of packages is important !!
 # packages updated on 27th April 2022
 exts_list = [
@@ -2796,6 +2804,7 @@ exts_list = [
     }),
     ('dbarts', '0.9-22', {
         'checksums': ['68fa2bfe274811c91ea7b67da46c4ffe527eb662d75edbec26ffe934ddc7150a'],
+        'preinstallopts': local_dbarts_preinstallopts,
     }),
     ('proftools', '0.99-3', {
         'checksums': ['e034eb1531af54013143da3e15229e1d4c2260f8eb79c93846014db3bdefb724'],
diff --git a/easybuild/easyconfigs/r/R/R-4.2.1-foss-2022a.eb b/easybuild/easyconfigs/r/R/R-4.2.1-foss-2022a.eb
index 9d6af6f22c4..d2734474d6c 100644
--- a/easybuild/easyconfigs/r/R/R-4.2.1-foss-2022a.eb
+++ b/easybuild/easyconfigs/r/R/R-4.2.1-foss-2022a.eb
@@ -77,6 +77,14 @@ exts_default_options = {
     'source_tmpl': '%(name)s_%(version)s.tar.gz',
 }
 
+# the dbarts extension needs an additional compiler flag on Arm systems to prevent "incompatible types" errors
+# cfr. https://github.com/vdorie/dbarts/issues/66
+if ARCH == 'aarch64':
+    local_dbarts_preinstallopts = 'sed -i "s|-c partition_neon.c|-flax-vector-conversions -c partition_neon.c|"'
+    local_dbarts_preinstallopts += ' src/misc/Makefile && '
+else:
+    local_dbarts_preinstallopts = ''
+
 # !! order of packages is important !!
 # packages updated on 23rd June 2022
 exts_list = [
@@ -2797,6 +2805,7 @@ exts_list = [
     }),
     ('dbarts', '0.9-22', {
         'checksums': ['68fa2bfe274811c91ea7b67da46c4ffe527eb662d75edbec26ffe934ddc7150a'],
+        'preinstallopts': local_dbarts_preinstallopts,
     }),
     ('proftools', '0.99-3', {
         'checksums': ['e034eb1531af54013143da3e15229e1d4c2260f8eb79c93846014db3bdefb724'],
diff --git a/easybuild/easyconfigs/r/R/R-4.2.2-foss-2022b.eb b/easybuild/easyconfigs/r/R/R-4.2.2-foss-2022b.eb
index 4e319447dd0..ebc872e51a4 100644
--- a/easybuild/easyconfigs/r/R/R-4.2.2-foss-2022b.eb
+++ b/easybuild/easyconfigs/r/R/R-4.2.2-foss-2022b.eb
@@ -77,6 +77,14 @@ exts_default_options = {
     'source_tmpl': '%(name)s_%(version)s.tar.gz',
 }
 
+# the dbarts extension needs an additional compiler flag on Arm systems to prevent "incompatible types" errors
+# cfr. https://github.com/vdorie/dbarts/issues/66
+if ARCH == 'aarch64':
+    local_dbarts_preinstallopts = 'sed -i "s|-c partition_neon.c|-flax-vector-conversions -c partition_neon.c|"'
+    local_dbarts_preinstallopts += ' src/misc/Makefile && '
+else:
+    local_dbarts_preinstallopts = ''
+
 # !! order of packages is important !!
 # packages updated on 17th March 2023
 exts_list = [
@@ -2856,6 +2864,7 @@ exts_list = [
     }),
     ('dbarts', '0.9-23', {
         'checksums': ['e1ac65fd89c321895d4f0e77d9cd8dcda5f1103485008afd4e19e6c9137557a3'],
+        'preinstallopts': local_dbarts_preinstallopts,
     }),
     ('proftools', '0.99-3', {
         'checksums': ['e034eb1531af54013143da3e15229e1d4c2260f8eb79c93846014db3bdefb724'],