From gitlab at gitlab.freedesktop.org Mon Feb 3 00:24:43 2025 From: gitlab at gitlab.freedesktop.org (Samuel Thibault (@sthibaul)) Date: Mon, 03 Feb 2025 00:24:43 +0000 Subject: [Git][slirp/libslirp][master] 2 commits: meson: add dependency override for libslirp Message-ID: <67a00ccbe2300_1a4eec3710268281b@gitlab-prod-sidekiq-native-chart-v2-68474f4664-stxbw.mail> Samuel Thibault pushed to branch master at slirp / libslirp Commits: fcedbc15 by Benjamin Gilbert at 2025-02-02T16:02:31-08:00 meson: add dependency override for libslirp If libslirp is built as a Meson subproject, Meson needs to associate the superproject's dependency('slirp') call with our libslirp_libdep variable. The slirp.wrap file shipped in Meson wrapdb accomplishes this with: [provide] slirp = libslirp_libdep But that requires wrapdb to know the name of our libslirp_libdep variable, which changed in 04612eb31674. Explicitly bind the pkg-config name 'slirp' to libslirp_libdep. This will allow slirp.wrap to say: [provide] dependency_names = slirp and avoid hardcoding the variable name. - - - - - 3aba0129 by Samuel Thibault at 2025-02-03T00:24:40+00:00 Merge branch 'override' into 'master' meson: add dependency override for libslirp See merge request slirp/libslirp!150 - - - - - 1 changed file: - meson.build Changes: ===================================== meson.build ===================================== @@ -264,5 +264,6 @@ libslirp_libdep = declare_dependency( link_with : lib, include_directories : [include_directories('src'), include_directories('.')], ) +meson.override_dependency('slirp', libslirp_libdep) subdir('fuzzing') View it on GitLab: https://gitlab.freedesktop.org/slirp/libslirp/-/compare/5ac3e5d7d9174f1411fc9c3001a08ac95af9808c...3aba012907471f886077a1a288f803bcd5a6e895 -- View it on GitLab: https://gitlab.freedesktop.org/slirp/libslirp/-/compare/5ac3e5d7d9174f1411fc9c3001a08ac95af9808c...3aba012907471f886077a1a288f803bcd5a6e895 You're receiving this email because of your account on gitlab.freedesktop.org. -------------- next part -------------- An HTML attachment was scrubbed... URL: