From dd5aefa3c48e1fb554c0049e6c07131bcdeb35af Mon Sep 17 00:00:00 2001 From: Simon Branford Date: Fri, 7 Jun 2024 09:44:23 +0100 Subject: [PATCH] build both static and shared libs for Brotli 1.1.0 --- .../easyconfigs/b/Brotli/Brotli-1.1.0-GCCcore-13.2.0.eb | 5 ++++- .../easyconfigs/b/Brotli/Brotli-1.1.0-GCCcore-13.3.0.eb | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/b/Brotli/Brotli-1.1.0-GCCcore-13.2.0.eb b/easybuild/easyconfigs/b/Brotli/Brotli-1.1.0-GCCcore-13.2.0.eb index eeacd7396525..2e194e0d508b 100644 --- a/easybuild/easyconfigs/b/Brotli/Brotli-1.1.0-GCCcore-13.2.0.eb +++ b/easybuild/easyconfigs/b/Brotli/Brotli-1.1.0-GCCcore-13.2.0.eb @@ -21,8 +21,11 @@ builddependencies = [ ('CMake', '3.27.6'), ] +configopts = ['-DBUILD_SHARED_LIBS=ON', '-DBUILD_SHARED_LIBS=OFF'] + sanity_check_paths = { - 'files': ['bin/brotli', 'lib/libbrotlidec.%s' % SHLIB_EXT, 'lib/libbrotlienc.%s' % SHLIB_EXT], + 'files': ['bin/brotli', 'lib/libbrotlidec.%s' % SHLIB_EXT, 'lib/libbrotlienc.%s' % SHLIB_EXT, + 'lib/libbrotlidec.a', 'lib/libbrotlienc.a'], 'dirs': [], } diff --git a/easybuild/easyconfigs/b/Brotli/Brotli-1.1.0-GCCcore-13.3.0.eb b/easybuild/easyconfigs/b/Brotli/Brotli-1.1.0-GCCcore-13.3.0.eb index 88c115d26f2e..fe7258a493fd 100644 --- a/easybuild/easyconfigs/b/Brotli/Brotli-1.1.0-GCCcore-13.3.0.eb +++ b/easybuild/easyconfigs/b/Brotli/Brotli-1.1.0-GCCcore-13.3.0.eb @@ -21,8 +21,11 @@ builddependencies = [ ('CMake', '3.29.3'), ] +configopts = ['-DBUILD_SHARED_LIBS=ON', '-DBUILD_SHARED_LIBS=OFF'] + sanity_check_paths = { - 'files': ['bin/brotli', 'lib/libbrotlidec.%s' % SHLIB_EXT, 'lib/libbrotlienc.%s' % SHLIB_EXT], + 'files': ['bin/brotli', 'lib/libbrotlidec.%s' % SHLIB_EXT, 'lib/libbrotlienc.%s' % SHLIB_EXT, + 'lib/libbrotlidec.a', 'lib/libbrotlienc.a'], 'dirs': [], }