diff --git a/easybuild/easyconfigs/r/R/R-3.6.2-foss-2019b.eb b/easybuild/easyconfigs/r/R/R-3.6.2-foss-2019b.eb index fe37f3a49bf..cf93f09b683 100644 --- a/easybuild/easyconfigs/r/R/R-3.6.2-foss-2019b.eb +++ b/easybuild/easyconfigs/r/R/R-3.6.2-foss-2019b.eb @@ -9,7 +9,13 @@ toolchain = {'name': 'foss', 'version': '2019b'} source_urls = ['https://cloud.r-project.org/src/base/R-%(version_major)s'] sources = [SOURCE_TAR_GZ] -checksums = ['bd65a45cddfb88f37370fbcee4ac8dd3f1aebeebe47c2f968fd9770ba2bbc954'] +patches = [ + '%(name)s-%(version)s_base_ppc64le.patch', +] +checksums = [ + 'bd65a45cddfb88f37370fbcee4ac8dd3f1aebeebe47c2f968fd9770ba2bbc954', # R-3.6.2.tar.gz + '905b632f391bf0ccc9f326c54914a03dfb9eb3ef7bc6865e7fd5c2f2eb733f93', # R-3.6.2_base_ppc64le.patch +] builddependencies = [ ('pkg-config', '0.29.2'), @@ -243,6 +249,7 @@ exts_list = [ 'checksums': ['faa25754b757fe483b876f5d07b73f76f69a1baa971420892fadec4af4bbad21'], }), ('cubature', '2.0.4', { + 'update_config_guess': True, 'checksums': ['d97ce5eaac5e43910208e8274ddf6ff4f974d05688f0247ebccd807e24c2fe4a'], }), ('DEoptimR', '1.0-8', { @@ -2098,9 +2105,6 @@ exts_list = [ ('asnipe', '1.1.12', { 'checksums': ['3a1f166f1c71b5877a2acca1384ec6c9b430b67af67ef26125f2abbb53c66206'], }), - ('liquidSVM', '1.2.4', { - 'checksums': ['15a9c7f2930e2ed3f4c5bcd9b042884ea580d2b2e52e1c68041600c196046aba'], - }), ('oddsratio', '2.0.0', { 'checksums': ['89bf3c68a6ded6a98f4ee8d487c29605ad00ac5f8db9b8bf1a52144e65332553'], }), diff --git a/easybuild/easyconfigs/r/R/R-3.6.2-fosscuda-2019b.eb b/easybuild/easyconfigs/r/R/R-3.6.2-fosscuda-2019b.eb index 6da4bb2e18c..58b3cdfc0cf 100644 --- a/easybuild/easyconfigs/r/R/R-3.6.2-fosscuda-2019b.eb +++ b/easybuild/easyconfigs/r/R/R-3.6.2-fosscuda-2019b.eb @@ -9,7 +9,13 @@ toolchain = {'name': 'fosscuda', 'version': '2019b'} source_urls = ['https://cloud.r-project.org/src/base/R-%(version_major)s'] sources = [SOURCE_TAR_GZ] -checksums = ['bd65a45cddfb88f37370fbcee4ac8dd3f1aebeebe47c2f968fd9770ba2bbc954'] +patches = [ + '%(name)s-%(version)s_base_ppc64le.patch', +] +checksums = [ + 'bd65a45cddfb88f37370fbcee4ac8dd3f1aebeebe47c2f968fd9770ba2bbc954', # R-3.6.2.tar.gz + '905b632f391bf0ccc9f326c54914a03dfb9eb3ef7bc6865e7fd5c2f2eb733f93', # R-3.6.2_base_ppc64le.patch +] builddependencies = [ ('pkg-config', '0.29.2'), @@ -244,6 +250,7 @@ exts_list = [ 'checksums': ['faa25754b757fe483b876f5d07b73f76f69a1baa971420892fadec4af4bbad21'], }), ('cubature', '2.0.4', { + 'update_config_guess': True, 'checksums': ['d97ce5eaac5e43910208e8274ddf6ff4f974d05688f0247ebccd807e24c2fe4a'], }), ('DEoptimR', '1.0-8', { @@ -2099,9 +2106,6 @@ exts_list = [ ('asnipe', '1.1.12', { 'checksums': ['3a1f166f1c71b5877a2acca1384ec6c9b430b67af67ef26125f2abbb53c66206'], }), - ('liquidSVM', '1.2.4', { - 'checksums': ['15a9c7f2930e2ed3f4c5bcd9b042884ea580d2b2e52e1c68041600c196046aba'], - }), ('oddsratio', '2.0.0', { 'checksums': ['89bf3c68a6ded6a98f4ee8d487c29605ad00ac5f8db9b8bf1a52144e65332553'], }), diff --git a/easybuild/easyconfigs/r/R/R-3.6.2_base_ppc64le.patch b/easybuild/easyconfigs/r/R/R-3.6.2_base_ppc64le.patch new file mode 100644 index 00000000000..02a4035175d --- /dev/null +++ b/easybuild/easyconfigs/r/R/R-3.6.2_base_ppc64le.patch @@ -0,0 +1,19 @@ +Index: src/main/arithmetic.c +=================================================================== +--- src/main/arithmetic.c (Revision 77583) ++++ src/main/arithmetic.c (Arbeitskopie) +@@ -176,8 +176,14 @@ + #endif + } + ++ + #if HAVE_LONG_DOUBLE && (SIZEOF_LONG_DOUBLE > SIZEOF_DOUBLE) ++# ifdef __PPC64__ ++ // PowerPC 64 (when gcc has -mlong-double-128) breaks here ... ++# define q_1_eps (1 / LDBL_EPSILON) ++# else + static LDOUBLE q_1_eps = 1 / LDBL_EPSILON; ++# endif + #else + static double q_1_eps = 1 / DBL_EPSILON; + #endif