From a025c619b617c24a2be3a86dcad69d1bb25b477d Mon Sep 17 00:00:00 2001 From: Justus Kuhlmann Date: Wed, 18 Sep 2024 13:32:29 +0000 Subject: [PATCH 1/4] use eb-built libnsl for git-annex --- .../git-annex-10.20230802-GCCcore-12.2.0.eb | 1 + .../git-annex-10.20230802-GCCcore-12.3.0.eb | 1 + .../git-annex-10.20240731-GCCcore-13.3.0.eb | 1 + .../l/libnsl/libnsl-2.0.1-GCCcore-13.3.0.eb | 33 +++++++++++++++++++ .../libtirpc/libtirpc-1.3.5-GCCcore-13.3.0.eb | 28 ++++++++++++++++ 5 files changed, 64 insertions(+) create mode 100644 easybuild/easyconfigs/l/libnsl/libnsl-2.0.1-GCCcore-13.3.0.eb create mode 100644 easybuild/easyconfigs/l/libtirpc/libtirpc-1.3.5-GCCcore-13.3.0.eb diff --git a/easybuild/easyconfigs/g/git-annex/git-annex-10.20230802-GCCcore-12.2.0.eb b/easybuild/easyconfigs/g/git-annex/git-annex-10.20230802-GCCcore-12.2.0.eb index 2e2696826f6..58d3de407c2 100644 --- a/easybuild/easyconfigs/g/git-annex/git-annex-10.20230802-GCCcore-12.2.0.eb +++ b/easybuild/easyconfigs/g/git-annex/git-annex-10.20230802-GCCcore-12.2.0.eb @@ -16,6 +16,7 @@ dependencies = [ ('GHC', '9.2.2', '-x86_64', SYSTEM), ('Stack', '2.11.1', '-x86_64', SYSTEM), ('git', '2.38.1', '-nodocs'), + ('libnsl', '2.0.0'), ] sources = [{ diff --git a/easybuild/easyconfigs/g/git-annex/git-annex-10.20230802-GCCcore-12.3.0.eb b/easybuild/easyconfigs/g/git-annex/git-annex-10.20230802-GCCcore-12.3.0.eb index 6b6af7f9eba..0e7cce68755 100644 --- a/easybuild/easyconfigs/g/git-annex/git-annex-10.20230802-GCCcore-12.3.0.eb +++ b/easybuild/easyconfigs/g/git-annex/git-annex-10.20230802-GCCcore-12.3.0.eb @@ -18,6 +18,7 @@ dependencies = [ ('GHC', '9.4.6', '-x86_64', SYSTEM), ('Stack', '2.13.1', '-x86_64', SYSTEM), ('git', '2.41.0', '-nodocs'), + ('libnsl', '2.0.1' ), ] sources = [{ diff --git a/easybuild/easyconfigs/g/git-annex/git-annex-10.20240731-GCCcore-13.3.0.eb b/easybuild/easyconfigs/g/git-annex/git-annex-10.20240731-GCCcore-13.3.0.eb index 89c70af2f45..8b981e6ea6c 100644 --- a/easybuild/easyconfigs/g/git-annex/git-annex-10.20240731-GCCcore-13.3.0.eb +++ b/easybuild/easyconfigs/g/git-annex/git-annex-10.20240731-GCCcore-13.3.0.eb @@ -18,6 +18,7 @@ dependencies = [ ('GHC', '9.10.1', '-x86_64', SYSTEM), ('Stack', '3.1.1', '-x86_64', SYSTEM), ('git', '2.45.1'), + ('libnsl', '2.0.1'), ] sources = [{ diff --git a/easybuild/easyconfigs/l/libnsl/libnsl-2.0.1-GCCcore-13.3.0.eb b/easybuild/easyconfigs/l/libnsl/libnsl-2.0.1-GCCcore-13.3.0.eb new file mode 100644 index 00000000000..ee8ad125324 --- /dev/null +++ b/easybuild/easyconfigs/l/libnsl/libnsl-2.0.1-GCCcore-13.3.0.eb @@ -0,0 +1,33 @@ +easyblock = 'ConfigureMake' + +name = 'libnsl' +version = '2.0.1' + +homepage = 'https://github.com/thkukuk/libnsl' +description = """The libnsl package contains the public client interface for NIS(YP).""" + +toolchain = {'name': 'GCCcore', 'version': '13.3.0'} + +source_urls = ['https://github.com/thkukuk/%(name)s/releases/download/v%(version)s/'] +sources = [SOURCE_TAR_XZ] +checksums = ['5c9e470b232a7acd3433491ac5221b4832f0c71318618dc6aa04dd05ffcd8fd9'] + +builddependencies = [ + ('binutils', '2.42'), +] + +dependencies = [ + ('libtirpc', '1.3.3'), +] + +# Provide a symlink for libnsl.so.1, which used to be part of glibc. +# This new version of libnsl should be backwards compatible. +postinstallcmds = ['ln -s libnsl.so %(installdir)s/lib/libnsl.so.1'] + +sanity_check_paths = { + 'files': ['include/rpcsvc/yp.h', 'lib/libnsl.a', + 'lib/libnsl.%s' % SHLIB_EXT, 'lib/libnsl.%s.1' % SHLIB_EXT], + 'dirs': ['include'] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/l/libtirpc/libtirpc-1.3.5-GCCcore-13.3.0.eb b/easybuild/easyconfigs/l/libtirpc/libtirpc-1.3.5-GCCcore-13.3.0.eb new file mode 100644 index 00000000000..30a34609ef9 --- /dev/null +++ b/easybuild/easyconfigs/l/libtirpc/libtirpc-1.3.5-GCCcore-13.3.0.eb @@ -0,0 +1,28 @@ +easyblock = 'ConfigureMake' + +name = 'libtirpc' +version = '1.3.5' + +homepage = 'https://sourceforge.net/projects/libtirpc/' +description = "Libtirpc is a port of Suns Transport-Independent RPC library to Linux." + +toolchain = {'name': 'GCCcore', 'version': '13.3.0'} + +source_urls = [SOURCEFORGE_SOURCE] +sources = [SOURCE_TAR_BZ2] +checksums = ['1e0b0c7231c5fa122e06c0609a76723664d068b0dba3b8219b63e6340b347860'] + +configopts = '--enable-static --enable-shared --disable-gssapi' + +builddependencies = [ + ('binutils', '2.42') +] + +sanity_check_paths = { + 'files': ['lib/libtirpc.%s' % (x,) for x in ['a', SHLIB_EXT]], + 'dirs': ['include/tirpc', 'lib'], +} + +modextrapaths = {'CPATH': 'include/tirpc'} + +moduleclass = 'lib' From 199e765b7a77699c90c8069fd967bc0c92df0277 Mon Sep 17 00:00:00 2001 From: Justus Kuhlmann Date: Wed, 18 Sep 2024 13:36:54 +0000 Subject: [PATCH 2/4] correct libtirpc version --- easybuild/easyconfigs/l/libnsl/libnsl-2.0.1-GCCcore-13.3.0.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/l/libnsl/libnsl-2.0.1-GCCcore-13.3.0.eb b/easybuild/easyconfigs/l/libnsl/libnsl-2.0.1-GCCcore-13.3.0.eb index ee8ad125324..818f1687a15 100644 --- a/easybuild/easyconfigs/l/libnsl/libnsl-2.0.1-GCCcore-13.3.0.eb +++ b/easybuild/easyconfigs/l/libnsl/libnsl-2.0.1-GCCcore-13.3.0.eb @@ -17,7 +17,7 @@ builddependencies = [ ] dependencies = [ - ('libtirpc', '1.3.3'), + ('libtirpc', '1.3.5'), ] # Provide a symlink for libnsl.so.1, which used to be part of glibc. From 4a91a8842b05c7a0f154f33547d61065f1f5c863 Mon Sep 17 00:00:00 2001 From: Justus Kuhlmann Date: Thu, 19 Sep 2024 07:01:27 +0000 Subject: [PATCH 3/4] correct checksum --- .../easyconfigs/l/libtirpc/libtirpc-1.3.5-GCCcore-13.3.0.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/l/libtirpc/libtirpc-1.3.5-GCCcore-13.3.0.eb b/easybuild/easyconfigs/l/libtirpc/libtirpc-1.3.5-GCCcore-13.3.0.eb index 30a34609ef9..a9fc2a5d749 100644 --- a/easybuild/easyconfigs/l/libtirpc/libtirpc-1.3.5-GCCcore-13.3.0.eb +++ b/easybuild/easyconfigs/l/libtirpc/libtirpc-1.3.5-GCCcore-13.3.0.eb @@ -10,7 +10,7 @@ toolchain = {'name': 'GCCcore', 'version': '13.3.0'} source_urls = [SOURCEFORGE_SOURCE] sources = [SOURCE_TAR_BZ2] -checksums = ['1e0b0c7231c5fa122e06c0609a76723664d068b0dba3b8219b63e6340b347860'] +checksums = ['9b31370e5a38d3391bf37edfa22498e28fe2142467ae6be7a17c9068ec0bf12f'] configopts = '--enable-static --enable-shared --disable-gssapi' From 9c622192222fbe0e615d09c54a1daf24e263b058 Mon Sep 17 00:00:00 2001 From: Justus Kuhlmann Date: Thu, 19 Sep 2024 08:54:09 +0000 Subject: [PATCH 4/4] lint --- .../g/git-annex/git-annex-10.20230802-GCCcore-12.3.0.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/g/git-annex/git-annex-10.20230802-GCCcore-12.3.0.eb b/easybuild/easyconfigs/g/git-annex/git-annex-10.20230802-GCCcore-12.3.0.eb index 0e7cce68755..5b362fb5873 100644 --- a/easybuild/easyconfigs/g/git-annex/git-annex-10.20230802-GCCcore-12.3.0.eb +++ b/easybuild/easyconfigs/g/git-annex/git-annex-10.20230802-GCCcore-12.3.0.eb @@ -18,7 +18,7 @@ dependencies = [ ('GHC', '9.4.6', '-x86_64', SYSTEM), ('Stack', '2.13.1', '-x86_64', SYSTEM), ('git', '2.41.0', '-nodocs'), - ('libnsl', '2.0.1' ), + ('libnsl', '2.0.1'), ] sources = [{