add patch for bug/typo in RISC-V toolchain options

bedroge · Oct 4, 2024 · 35d635c · 35d635c
1 parent 8e4d509
commit 35d635c
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.9.4.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.9.4.eb
@@ -18,9 +18,6 @@ source_urls = [
     # easybuild-easyconfigs
     'https://files.pythonhosted.org/packages/ed/2c/7b2b22235ffe9310a93cbfef06fb3723466aa8ccc4aca4888b59433e55a6/',
 ]
-# note: subdirectory for each unpacked source tarball is renamed because custom easyblock in older EasyBuild version
-# that is used for installing EasyBuild with EasyBuild expects subdirectories with '-' rather than '_';
-# see also https://github.com/easybuilders/easybuild-easyblocks/pull/3358
 sources = [
     {
         'filename': 'easybuild_framework-%(version)s.tar.gz',
@@ -35,12 +32,22 @@ sources = [
         'extract_cmd': "tar xfvz %s && mv easybuild_easyconfigs-%(version)s easybuild-easyconfigs-%(version)s",
     },
 ]
+patches = ['EasyBuild-4.9.4_fix-riscv-toolchain-opts-typo.patch']
 checksums = [
     {'easybuild_framework-4.9.4.tar.gz': '5b380a2e3a359f64f06789c390200b922a840f6b10b441e5163696a34bd9bc27'},
     {'easybuild_easyblocks-4.9.4.tar.gz': '1272f1e294090caafde8cbda72ae344ef400fdd161163781f67b3cffe761dd62'},
     {'easybuild_easyconfigs-4.9.4.tar.gz': 'beee4e098f5fee18f2029d6a0b893549aba26e075b147cc0008cb16fd4c8d982'},
+    {'EasyBuild-4.9.4_fix-riscv-toolchain-opts-typo.patch':
+     '602d9abfdd90f435bdc877b1d2710a17ae577c790914e7bf61428dc7073ad1b6'},
 ]
 
+# note: subdirectory for each unpacked source tarball is renamed because custom easyblock in older EasyBuild version
+# that is used for installing EasyBuild with EasyBuild expects subdirectories with '-' rather than '_';
+# see also https://github.com/easybuilders/easybuild-easyblocks/pull/3358
+#    {'easybuild_framework-4.9.4.tar.gz': '5b380a2e3a359f64f06789c390200b922a840f6b10b441e5163696a34bd9bc27'},
+#    {'easybuild_easyblocks-4.9.4.tar.gz': '1272f1e294090caafde8cbda72ae344ef400fdd161163781f67b3cffe761dd62'},
+#    {'easybuild_easyconfigs-4.9.4.tar.gz': 'beee4e098f5fee18f2029d6a0b893549aba26e075b147cc0008cb16fd4c8d982'},
+
 # order matters a lot, to avoid having dependencies auto-resolved (--no-deps easy_install option doesn't work?)
 # EasyBuild is a (set of) Python packages, so it depends on Python
 # usually, we want to use the system Python, so no actual Python dependency is listed

diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.9.4_fix-riscv-toolchain-opts-typo.patch b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-4.9.4_fix-riscv-toolchain-opts-typo.patch
@@ -0,0 +1,23 @@
+https://github.com/easybuilders/easybuild-framework/pull/4668
+From 688c6709504c4b54f881b9a674c3c5dfd6acd241 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
+Date: Fri, 4 Oct 2024 16:35:35 +0200
+Subject: [PATCH] fix typo in veryloose toolchain option
+
+---
+ easybuild/toolchains/compiler/gcc.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/easybuild/toolchains/compiler/gcc.py b/easybuild/toolchains/compiler/gcc.py
+index e9748f3bda..fd50ad2c03 100644
+--- a/easybuild/toolchains/compiler/gcc.py
++++ b/easybuild/toolchains/compiler/gcc.py
+@@ -85,7 +85,7 @@ class Gcc(Compiler):
+         COMPILER_UNIQUE_OPTION_MAP['strict'] = []
+         COMPILER_UNIQUE_OPTION_MAP['precise'] = []
+         COMPILER_UNIQUE_OPTION_MAP['loose'] = ['fno-math-errno']
+-        COMPILER_UNIQUE_OPTION_MAP['verloose'] = ['fno-math-errno']
++        COMPILER_UNIQUE_OPTION_MAP['veryloose'] = ['fno-math-errno']
+
+     # used when 'optarch' toolchain option is enabled (and --optarch is not specified)
+     COMPILER_OPTIMAL_ARCHITECTURE_OPTION = {