Merge pull request easybuilders#20747 from Micket/20240605142910_new_…

…pr_libavif0111 Move all libavifs to GCCcore only, fix deps
bedroge · Jun 5, 2024 · 01e8cee · 01e8cee
2 parents 91b4612 + 0aacb02
commit 01e8cee
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 47 deletions.
diff --git a/...gs/l/libavif/libavif-0.11.1-foss-2021a.eb → .../libavif/libavif-0.11.1-GCCcore-10.3.0.eb b/...gs/l/libavif/libavif-0.11.1-foss-2021a.eb → .../libavif/libavif-0.11.1-GCCcore-10.3.0.eb
@@ -11,17 +11,15 @@ description = """This library aims to be a friendly, portable C implementation o
 as described here: https://aomediacodec.github.io/av1-avif/
 """
 
-toolchain = {'name': 'foss', 'version': '2021a'}
+toolchain = {'name': 'GCCcore', 'version': '10.3.0'}
 
 source_urls = ['https://github.com/AOMediaCodec/libavif/archive/']
 sources = ['v%(version)s.tar.gz']
 checksums = ['0eb49965562a0e5e5de58389650d434cff32af84c34185b6c9b7b2fccae06d4e']
 
 builddependencies = [
     ('CMake', '3.20.1'),
-]
-
-dependencies = [
+    ('binutils', '2.36.1'),
     ('NASM', '2.15.05'),
     ('Meson', '0.58.0'),
     ('Ninja', '1.10.2'),

diff --git a/easybuild/easyconfigs/l/libavif/libavif-0.11.1-GCCcore-11.3.0.eb b/easybuild/easyconfigs/l/libavif/libavif-0.11.1-GCCcore-11.3.0.eb
@@ -20,9 +20,6 @@ checksums = ['0eb49965562a0e5e5de58389650d434cff32af84c34185b6c9b7b2fccae06d4e']
 builddependencies = [
     ('CMake', '3.23.1'),
     ('binutils', '2.38'),
-]
-
-dependencies = [
     ('NASM', '2.15.05'),
     ('Meson', '0.62.1'),
     ('Ninja', '1.10.2'),

diff --git a/easybuild/easyconfigs/l/libavif/libavif-0.11.1-foss-2022a.eb b/easybuild/easyconfigs/l/libavif/libavif-0.11.1-foss-2022a.eb
diff --git a/...igs/l/libavif/libavif-1.0.4-foss-2023a.eb → ...l/libavif/libavif-1.0.4-GCCcore-12.3.0.eb b/...igs/l/libavif/libavif-1.0.4-foss-2023a.eb → ...l/libavif/libavif-1.0.4-GCCcore-12.3.0.eb
@@ -11,17 +11,15 @@ description = """This library aims to be a friendly, portable C implementation o
 as described here: https://aomediacodec.github.io/av1-avif/
 """
 
-toolchain = {'name': 'foss', 'version': '2023a'}
+toolchain = {'name': 'GCCcore', 'version': '12.3.0'}
 
 source_urls = ['https://github.com/AOMediaCodec/libavif/archive/']
 sources = ['v%(version)s.tar.gz']
 checksums = ['dc56708c83a4b934a8af2b78f67f866ba2fb568605c7cf94312acf51ee57d146']
 
 builddependencies = [
     ('CMake', '3.26.3'),
-]
-
-dependencies = [
+    ('binutils', '2.40'),
     ('NASM', '2.16.01'),
     ('Meson', '1.1.1'),
     ('Ninja', '1.11.1'),