From ea076ae1def18d26b63fa2153e2be088d8d41bca Mon Sep 17 00:00:00 2001 From: mssmzs Date: Wed, 3 Apr 2024 22:59:26 +0100 Subject: [PATCH 1/8] adding easyconfigs: libzip-1.10.1-GCCcore-13.2.0.eb --- .../l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100755 easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb diff --git a/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb b/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb new file mode 100755 index 00000000000..e0998b1c6a6 --- /dev/null +++ b/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb @@ -0,0 +1,32 @@ +easyblock = 'CMakeMake' + +name = 'libzip' +version = '1.10.1' + +homepage = 'https://libzip.org/' +description = "libzip is a C library for reading, creating, and modifying zip archives." + +toolchain = {'name': 'GCCcore', 'version': '13.2.0'} + +source_urls = ['https://github.com/nih-at/libzip/archive/'] +sources = ['v%(version)s.tar.gz'] +checksums = ['d56d857d1c3ad4a7f3a4c01a51c6a6e5530e35ab93503f62276e8ba2b306186a'] + +builddependencies = [ + ('binutils', '2.40'), + ('CMake', '3.27.6'), +] + +dependencies = [('zlib', '1.2.13')] + +sanity_check_paths = { + 'files': [ + 'bin/zipcmp', + 'bin/zipmerge', + 'bin/ziptool', + 'lib64/libzip.%s' % SHLIB_EXT, + ], + 'dirs': ['include', 'lib/pkgconfig'], +} + +moduleclass = 'lib' From ccb9c6942a2838782d7ef256443ec2260afb7abf Mon Sep 17 00:00:00 2001 From: mssmzs Date: Thu, 4 Apr 2024 11:26:09 +0100 Subject: [PATCH 2/8] fix permissions --- easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb b/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb index e0998b1c6a6..99be49a252a 100755 --- a/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb +++ b/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb @@ -4,7 +4,7 @@ name = 'libzip' version = '1.10.1' homepage = 'https://libzip.org/' -description = "libzip is a C library for reading, creating, and modifying zip archives." +description = "libzip is a C library for reading, creating, and modifying zip archives.." toolchain = {'name': 'GCCcore', 'version': '13.2.0'} From 6a0d3bdb8e5624ffd9afe0ab82de0bf744a934f5 Mon Sep 17 00:00:00 2001 From: mssmzs Date: Thu, 4 Apr 2024 19:39:29 +0100 Subject: [PATCH 3/8] adding sanity check commands as per reviewer's request --- .../easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb b/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb index 99be49a252a..887eaf37405 100755 --- a/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb +++ b/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb @@ -29,4 +29,10 @@ sanity_check_paths = { 'dirs': ['include', 'lib/pkgconfig'], } +sanity_check_commands = [ + "zipcmp -h", + "zipmerge -h", + "ziptool -h" +] + moduleclass = 'lib' From 0f03e0cbff1bc6955aad67ced9fea1ca23b329f3 Mon Sep 17 00:00:00 2001 From: mssmzs Date: Wed, 10 Apr 2024 13:10:42 +0100 Subject: [PATCH 4/8] fix permissions --- easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb diff --git a/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb b/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb old mode 100755 new mode 100644 From 78a5b1b2b5bad75de0a7ee866bd3242766472323 Mon Sep 17 00:00:00 2001 From: "Tanmoy Chakraborty, Ph.D" <56235576+tanmoy1989@users.noreply.github.com> Date: Thu, 27 Jun 2024 16:34:10 +0100 Subject: [PATCH 5/8] Update easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Bob Dröge --- easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb b/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb index 887eaf37405..ae1adbcbcdd 100644 --- a/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb +++ b/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb @@ -4,7 +4,7 @@ name = 'libzip' version = '1.10.1' homepage = 'https://libzip.org/' -description = "libzip is a C library for reading, creating, and modifying zip archives.." +description = "libzip is a C library for reading, creating, and modifying zip archives." toolchain = {'name': 'GCCcore', 'version': '13.2.0'} From 148681d6cda7ff0947df6af188534f8313fd0c66 Mon Sep 17 00:00:00 2001 From: "Tanmoy Chakraborty, Ph.D" <56235576+tanmoy1989@users.noreply.github.com> Date: Thu, 27 Jun 2024 19:46:59 +0100 Subject: [PATCH 6/8] Update easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Bob Dröge --- .../easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb b/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb index ae1adbcbcdd..d54d1419fdc 100644 --- a/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb +++ b/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb @@ -17,7 +17,12 @@ builddependencies = [ ('CMake', '3.27.6'), ] -dependencies = [('zlib', '1.2.13')] +dependencies = [ + ('zlib', '1.2.13'), + ('bzip2', '1.0.8'), + ('XZ', '5.4.4'), + ('zstd', '1.5.5'), +] sanity_check_paths = { 'files': [ From 0f993baeb64c2ad12a6dade46b8886f750f2d276 Mon Sep 17 00:00:00 2001 From: "Tanmoy Chakraborty, Ph.D" <56235576+tanmoy1989@users.noreply.github.com> Date: Thu, 27 Jun 2024 20:11:48 +0100 Subject: [PATCH 7/8] Update easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Bob Dröge --- easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb | 1 + 1 file changed, 1 insertion(+) diff --git a/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb b/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb index d54d1419fdc..2986a9fc694 100644 --- a/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb +++ b/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb @@ -18,6 +18,7 @@ builddependencies = [ ] dependencies = [ + ('OpenSSL', '3'), ('zlib', '1.2.13'), ('bzip2', '1.0.8'), ('XZ', '5.4.4'), From 2183b333db9252aa6c821092180c39f7db3ff5d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 28 Jun 2024 09:24:04 +0200 Subject: [PATCH 8/8] Use OpenSSL 1.1, add SYSTEM toolchain to dep --- easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb b/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb index 2986a9fc694..99551efad57 100644 --- a/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb +++ b/easybuild/easyconfigs/l/libzip/libzip-1.10.1-GCCcore-13.2.0.eb @@ -18,7 +18,7 @@ builddependencies = [ ] dependencies = [ - ('OpenSSL', '3'), + ('OpenSSL', '1.1', '', SYSTEM), ('zlib', '1.2.13'), ('bzip2', '1.0.8'), ('XZ', '5.4.4'),