Fix pkgconfig files of zstd#24274
Conversation
| runtest = 'check' | ||
|
|
||
| installopts = "PREFIX=%(installdir)s" | ||
| buildopts = installopts = "PREFIX=%(installdir)s" |
There was a problem hiding this comment.
Minor nitpick. Not sure if we want to want to have this instead, just to make this a bit more readable (in my opinion):
| buildopts = installopts = "PREFIX=%(installdir)s" | |
| buildopts = "PREFIX=%(installdir)s" | |
| installopts = buildopts |
Otherwise, the change is quite straight-forward. We could even think about if we'd want to check that this is correctly set in the sanity check commands, right?
There was a problem hiding this comment.
IMO the current way is clearer: "set this and that to"
We could even think about if we'd want to check that this is correctly set in the sanity check commands, right?
Maybe do this in framework: For any "prefix=" line in installed pc files it should match the installdir or a subdir of it
|
Looks like this doesn't affect 1.5.7, but doesn't hurt to set this anyway $ cat /opt/EasyBuild/apps/software/zstd/1.5.7-GCCcore-14.3.0/lib/pkgconfig/libzstd.pc
# ZSTD - standard compression algorithm
# Copyright (c) Meta Platforms, Inc. and affiliates.
# BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
prefix=/opt/EasyBuild/apps/software/zstd/1.5.7-GCCcore-14.3.0
exec_prefix=${prefix}
includedir=${prefix}/include
libdir=${exec_prefix}/lib
Name: zstd
Description: fast lossless compression algorithm library
URL: https://facebook.github.io/zstd/
Version: 1.5.7
Libs: -L${libdir} -lzstd
Libs.private: -pthread
Cflags: -I${includedir}
$ cat /opt/EasyBuild/apps/software/zstd/1.5.6-GCCcore-14.2.0/lib/pkgconfig/libzstd.pc
# ZSTD - standard compression algorithm
# Copyright (c) Meta Platforms, Inc. and affiliates.
# BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
prefix=/usr/local
exec_prefix=${prefix}
includedir=${prefix}/include
libdir=${exec_prefix}/lib
Name: zstd
Description: fast lossless compression algorithm library
URL: https://facebook.github.io/zstd/
Version: 1.5.6
Libs: -L${libdir} -lzstd
Libs.private: -pthread
Cflags: -I${includedir} |
|
@boegelbot please test @ jsc-zen3 |
|
@Thyre: Request for testing this PR well received on jsczen3l1.int.jsc-zen3.fz-juelich.de PR test command '
Test results coming soon (I hope)... Details- notification for comment with ID 3410451948 processed Message to humans: this is just bookkeeping information for me, |
|
Test report by @Flamefire Rebuild that 1: Test report by @Flamefire |
|
Test report by @Thyre |
|
Test report by @Flamefire |
|
Test report by @boegelbot |
Yes it was fixed in 1.5.7 "by accident" with facebook/zstd@f1f1ae3 |
Micket
left a comment
There was a problem hiding this comment.
lgtm, i don't mind the one-line buildopts/installopts
|
Test report by @Micket |
|
Going in, thanks @Flamefire! |
(created using
eb --new-pr)The pkgconfig file is created in the build step using
PREFIXdefaulting to/usr/localwhich is sued as we set PREFIX only for the install step. This might lead to the linker of dependent software picking up system software instead of EB software.As the change is small I fixed all ECs, especially as it can avoid major headaches when things go silently wrong