Skip to content

Commit cf9dcd8

Browse files
committed
build: Drop meson wraps
- libglnx wrap is no longer needed since it became a subtree [1] - libyaml is an optional dependency and widely available in distributions and we aren't actively looking for newer versions of it (development stopped for 5 years already but recently restarted). Moreover using it through a wrap raises a bunch of build warnings which are unfixed upstream. It is not exactly clear why it needed to be a wrap in [2] [1]: #692 [2]: #382 (comment)
1 parent ff724fa commit cf9dcd8

4 files changed

Lines changed: 7 additions & 25 deletions

File tree

.github/workflows/check.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,3 @@ jobs:
9999
run: |
100100
meson setup --wrap-mode nodownload --reconfigure ${CONFIG_OPTS} ${BUILDDIR}_dist .
101101
meson dist --include-subprojects -C ${BUILDDIR}_dist
102-
103-
- name: Configure flatpak-builder with Meson wraps
104-
run: meson setup --wrap-mode=forcefallback ${CONFIG_OPTS} ${BUILDDIR}_wrap .
105-
106-
- name: Build flatpak-builder with Meson wraps
107-
run: meson compile -C ${BUILDDIR}_wrap

src/meson.build

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@ config_h = configure_file(
4747
output: 'config.h',
4848
)
4949

50+
libglnx = subproject(
51+
'libglnx',
52+
default_options: ['tests=false'],
53+
)
54+
libglnx_dep = libglnx.get_variable('libglnx_dep')
55+
5056
glib_req = '>= 2.66'
5157
flatpak_builder_deps = [
5258
dependency('glib-2.0', version: glib_req),
@@ -55,10 +61,10 @@ flatpak_builder_deps = [
5561
dependency('json-glib-1.0'),
5662
dependency('libcurl'),
5763
dependency('libelf', version: '>= 0.8.12'),
58-
dependency('libglnx', default_options: ['tests=false']),
5964
dependency('libxml-2.0', version: '>= 2.4'),
6065
dependency('ostree-1', version: '>= 2017.14'),
6166
yaml_dep,
67+
libglnx_dep,
6268
]
6369

6470
flatpak_builder = executable(

subprojects/libglnx.wrap

Lines changed: 0 additions & 6 deletions
This file was deleted.

subprojects/libyaml.wrap

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)