Skip to content

Commit d65b48b

Browse files
authored
make sure that Brunsli libraries are installed into /lib (#19805)
1 parent 4da18b4 commit d65b48b

File tree

5 files changed

+30
-15
lines changed

5 files changed

+30
-15
lines changed

easybuild/easyconfigs/b/Brunsli/Brunsli-0.1-GCCcore-10.2.0.eb

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,19 @@ dependencies = [
2727
# skip use of third_party directory, since we provide Brotli via a proper dependency
2828
preconfigopts = "sed -i 's/add_subdirectory(third_party)//g' ../brunsli-%(version)s/CMakeLists.txt && "
2929

30-
configopts = '-DCMAKE_CXX_FLAGS="$CXXFLAGS -lbrotlienc -lbrotlidec -lbrotlicommon"'
30+
configopts = '-DCMAKE_CXX_FLAGS="$CXXFLAGS -lbrotlienc -lbrotlidec -lbrotlicommon" '
31+
32+
# make sure that libraries end up in <prefix>/lib (not lib64)
33+
configopts += "-DCMAKE_INSTALL_LIBDIR=lib "
3134

3235
buildopts = "BROTLI_DIR=$EBROOTBROTLI BROTLI_INCLUDE=$EBROOTBROTLI/include"
3336

3437
# also install dbrunsli binary and missing libraries
3538
postinstallcmds = [
3639
"mkdir %(installdir)s/bin",
3740
"cp dbrunsli %(installdir)s/bin/",
38-
"cp libbrunsli*.a %(installdir)s/lib*/",
39-
"cp libbrunsli*.%s %%(installdir)s/lib*/" % SHLIB_EXT,
41+
"cp libbrunsli*.a %(installdir)s/lib/",
42+
"cp libbrunsli*.%s %%(installdir)s/lib/" % SHLIB_EXT,
4043
]
4144

4245
sanity_check_paths = {

easybuild/easyconfigs/b/Brunsli/Brunsli-0.1-GCCcore-10.3.0.eb

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,19 @@ dependencies = [
2828
# skip use of third_party directory, since we provide Brotli via a proper dependency
2929
preconfigopts = "sed -i 's/add_subdirectory(third_party)//g' ../brunsli-%(version)s/CMakeLists.txt && "
3030

31-
configopts = '-DCMAKE_CXX_FLAGS="$CXXFLAGS -lbrotlienc -lbrotlidec -lbrotlicommon"'
31+
configopts = '-DCMAKE_CXX_FLAGS="$CXXFLAGS -lbrotlienc -lbrotlidec -lbrotlicommon" '
32+
33+
# make sure that libraries end up in <prefix>/lib (not lib64)
34+
configopts += "-DCMAKE_INSTALL_LIBDIR=lib "
3235

3336
buildopts = "BROTLI_DIR=$EBROOTBROTLI BROTLI_INCLUDE=$EBROOTBROTLI/include"
3437

3538
# also install dbrunsli binary and missing libraries
3639
postinstallcmds = [
3740
"mkdir %(installdir)s/bin",
3841
"cp dbrunsli %(installdir)s/bin/",
39-
"cp libbrunsli*.a %(installdir)s/lib*/",
40-
"cp libbrunsli*.%s %%(installdir)s/lib*/" % SHLIB_EXT,
42+
"cp libbrunsli*.a %(installdir)s/lib/",
43+
"cp libbrunsli*.%s %%(installdir)s/lib/" % SHLIB_EXT,
4144
]
4245

4346
sanity_check_paths = {

easybuild/easyconfigs/b/Brunsli/Brunsli-0.1-GCCcore-11.3.0.eb

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,19 @@ dependencies = [
2828
# skip use of third_party directory, since we provide Brotli via a proper dependency
2929
preconfigopts = "sed -i 's/add_subdirectory(third_party)//g' ../brunsli-%(version)s/CMakeLists.txt && "
3030

31-
configopts = '-DCMAKE_CXX_FLAGS="$CXXFLAGS -lbrotlienc -lbrotlidec -lbrotlicommon"'
31+
configopts = '-DCMAKE_CXX_FLAGS="$CXXFLAGS -lbrotlienc -lbrotlidec -lbrotlicommon" '
32+
33+
# make sure that libraries end up in <prefix>/lib (not lib64)
34+
configopts += "-DCMAKE_INSTALL_LIBDIR=lib "
3235

3336
buildopts = "BROTLI_DIR=$EBROOTBROTLI BROTLI_INCLUDE=$EBROOTBROTLI/include"
3437

3538
# also install dbrunsli binary and missing libraries
3639
postinstallcmds = [
3740
"mkdir %(installdir)s/bin",
3841
"cp dbrunsli %(installdir)s/bin/",
39-
"cp libbrunsli*.a %(installdir)s/lib*/",
40-
"cp libbrunsli*.%s %%(installdir)s/lib*/" % SHLIB_EXT,
42+
"cp libbrunsli*.a %(installdir)s/lib/",
43+
"cp libbrunsli*.%s %%(installdir)s/lib/" % SHLIB_EXT,
4144
]
4245

4346
sanity_check_paths = {

easybuild/easyconfigs/b/Brunsli/Brunsli-0.1-GCCcore-12.2.0.eb

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,19 @@ dependencies = [
2828
# skip use of third_party directory, since we provide Brotli via a proper dependency
2929
preconfigopts = "sed -i 's/add_subdirectory(third_party)//g' ../brunsli-%(version)s/CMakeLists.txt && "
3030

31-
configopts = '-DCMAKE_CXX_FLAGS="$CXXFLAGS -lbrotlienc -lbrotlidec -lbrotlicommon"'
31+
configopts = '-DCMAKE_CXX_FLAGS="$CXXFLAGS -lbrotlienc -lbrotlidec -lbrotlicommon" '
32+
33+
# make sure that libraries end up in <prefix>/lib (not lib64)
34+
configopts += "-DCMAKE_INSTALL_LIBDIR=lib "
3235

3336
buildopts = "BROTLI_DIR=$EBROOTBROTLI BROTLI_INCLUDE=$EBROOTBROTLI/include"
3437

3538
# also install dbrunsli binary and missing libraries
3639
postinstallcmds = [
3740
"mkdir %(installdir)s/bin",
3841
"cp dbrunsli %(installdir)s/bin/",
39-
"cp libbrunsli*.a %(installdir)s/lib*/",
40-
"cp libbrunsli*.%s %%(installdir)s/lib*/" % SHLIB_EXT,
42+
"cp libbrunsli*.a %(installdir)s/lib/",
43+
"cp libbrunsli*.%s %%(installdir)s/lib/" % SHLIB_EXT,
4144
]
4245

4346
sanity_check_paths = {

easybuild/easyconfigs/b/Brunsli/Brunsli-0.1-GCCcore-12.3.0.eb

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,19 @@ dependencies = [
2828
# skip use of third_party directory, since we provide Brotli via a proper dependency
2929
preconfigopts = "sed -i 's/add_subdirectory(third_party)//g' ../brunsli-%(version)s/CMakeLists.txt && "
3030

31-
configopts = '-DCMAKE_CXX_FLAGS="$CXXFLAGS -lbrotlienc -lbrotlidec -lbrotlicommon"'
31+
configopts = '-DCMAKE_CXX_FLAGS="$CXXFLAGS -lbrotlienc -lbrotlidec -lbrotlicommon" '
32+
33+
# make sure that libraries end up in <prefix>/lib (not lib64)
34+
configopts += "-DCMAKE_INSTALL_LIBDIR=lib "
3235

3336
buildopts = "BROTLI_DIR=$EBROOTBROTLI BROTLI_INCLUDE=$EBROOTBROTLI/include"
3437

3538
# also install dbrunsli binary and missing libraries
3639
postinstallcmds = [
3740
"mkdir %(installdir)s/bin",
3841
"cp dbrunsli %(installdir)s/bin/",
39-
"cp libbrunsli*.a %(installdir)s/lib*/",
40-
"cp libbrunsli*.%s %%(installdir)s/lib*/" % SHLIB_EXT,
42+
"cp libbrunsli*.a %(installdir)s/lib/",
43+
"cp libbrunsli*.%s %%(installdir)s/lib/" % SHLIB_EXT,
4144
]
4245

4346
sanity_check_paths = {

0 commit comments

Comments
 (0)