Make libdl optional in meson definition#305
Merged
Merged
Conversation
saschagrunert
commented
Oct 18, 2021
| language : 'c') | ||
|
|
||
| glib = dependency('glib-2.0') | ||
| libdl = cc.find_library('dl') |
Member
Author
Member
There was a problem hiding this comment.
it is used when conmon is built with seccomp (so with USE_SECCOMP)
Member
Author
There was a problem hiding this comment.
Hm, for example the nix build is using USE_SECCOMP=1 and works even with this patch. Do you think it's fine to remove it?
Member
There was a problem hiding this comment.
sorry for the delay, I've missed this notification.
The build works fine but if we try to load a seccomp plugin then it will fail.
Member
Author
There was a problem hiding this comment.
I made the dependency optional, which should work.
|
Just tested that PR: [tkloczko@barrel SPECS]$ bg; rpmbuild -ba --clean --rmsource --rmspec --rmsource conmon.spec
-bash: bg: current: no such job
warning: Downloading https://github.com/containers/conmon//archive/v2.0.30/conmon-2.0.30.tar.gz to /home/tkloczko/rpmbuild/SOURCES/conmon-2.0.30.tar.gz
warning: Downloading https://github.com/containers/conmon//pull/305.patch#/conmon-Remove-libdl-from-meson-definition.patch to /home/tkloczko/rpmbuild/SOURCES/conmon-Remove-libdl-from-meson-definition.patch
Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.y9rrF8
+ umask 022
+ cd /home/tkloczko/rpmbuild/BUILD
+ cd /home/tkloczko/rpmbuild/BUILD
+ rm -rf conmon-2.0.30
+ /usr/bin/gzip -dc /home/tkloczko/rpmbuild/SOURCES/conmon-2.0.30.tar.gz
+ /usr/bin/tar -xof -
+ STATUS=0
+ '[' 0 -ne 0 ']'
+ cd conmon-2.0.30
+ /usr/bin/chmod -Rf a+rX,u+w,g-w,o-w .
+ /usr/bin/cat /home/tkloczko/rpmbuild/SOURCES/conmon-remove_hardcoding_compiler_flags.patch
+ /usr/bin/patch -p1 -s --fuzz=0 --no-backup-if-mismatch -f
+ /usr/bin/cat /home/tkloczko/rpmbuild/SOURCES/conmon-Remove-libdl-from-meson-definition.patch
+ /usr/bin/patch -p1 -s --fuzz=0 --no-backup-if-mismatch -f
+ RPM_EC=0
++ jobs -p
[..]
+ /usr/bin/meson --buildtype=plain --prefix=/usr --libdir=/usr/lib64 --libexecdir=/usr/libexec --bindir=/usr/bin --sbindir=/usr/sbin --includedir=/usr/include --datadir=/usr/share --mandir=/usr/share/man --infodir=/usr/share/info --localedir=/usr/share/locale --sysconfdir=/etc --localstatedir=/var --sharedstatedir=/var/lib --wrap-mode=nodownload --auto-features=enabled . x86_64-redhat-linux-gnu
The Meson build system
Version: 0.59.2
Source dir: /home/tkloczko/rpmbuild/BUILD/conmon-2.0.30
Build dir: /home/tkloczko/rpmbuild/BUILD/conmon-2.0.30/x86_64-redhat-linux-gnu
Build type: native build
Project name: conmon
Project version: 2.0.30
C compiler for the host machine: /usr/bin/gcc (gcc 11.2.1 "gcc (GCC) 11.2.1 20210728 (Red Hat 11.2.1-1)")
C linker for the host machine: /usr/bin/gcc ld.bfd 2.37-15
Host machine cpu family: x86_64
Host machine cpu: x86_64
Program git found: YES (/usr/bin/git)
Found pkg-config: /usr/bin/pkg-config (1.8.0)
Run-time dependency glib-2.0 found: YES 2.70.0
Build targets in project: 1
Found ninja-1.10.2 at /usr/bin/ninja
[..]
Wrote: /home/tkloczko/rpmbuild/SRPMS/conmon-2.0.30-3.fc35.src.rpm
Wrote: /home/tkloczko/rpmbuild/RPMS/conmon-2.0.30-3.fc35.x86_64.rpm
Wrote: /home/tkloczko/rpmbuild/RPMS/conmon-debugsource-2.0.30-3.fc35.x86_64.rpm
Wrote: /home/tkloczko/rpmbuild/RPMS/conmon-debuginfo-2.0.30-3.fc35.x86_64.rpmThank you. |
saschagrunert
force-pushed
the
meson-libdl
branch
2 times, most recently
from
October 27, 2021 11:32
58b3283 to
a7ec912
Compare
saschagrunert
changed the title
Member
|
@saschagrunert What is going on with this PR? |
We now conditionally check for the availability of `dlopen` and add `libdl` if required. Fixes: containers#298 Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
saschagrunert
force-pushed
the
meson-libdl
branch
from
January 12, 2022 08:29
a7ec912 to
5a2cf98
Compare
Member
Author
It just needs to be reviewed :) |
Member
Author
|
@giuseppe PTAL |
Member
|
LGTM |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
We now conditionally check for the availability of
dlopenand addlibdlif required.Fixes: #298