Skip to content

Commit 904b3a3

Browse files
authored
Merge pull request #349 from glimchb/master
build: use uuid wrap for fallback build
2 parents 3f0bff8 + 5ba1e59 commit 904b3a3

3 files changed

Lines changed: 9 additions & 3 deletions

File tree

.github/workflows/meson.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: install libraries
35-
run: sudo apt-get remove -y libssl-dev
35+
run: sudo apt-get install -y libpam-dev libcap-ng-dev
3636
- uses: actions/checkout@v3
3737
- uses: actions/setup-python@v3
3838
- uses: BSFishy/[email protected]
3939
with:
40-
setup-options: --werror
40+
setup-options: --werror --wrap-mode=forcefallback
4141
options: --verbose
4242
action: test
4343
meson-version: 0.61.2

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ conf.set('PROJECT_VERSION', '"@0@"'.format(meson.project_version()))
5151
conf.set('SYSCONFDIR', '"@0@"'.format(sysconfdir))
5252

5353
# Check for libuuid availability
54-
libuuid_dep = dependency('uuid', required: true)
54+
libuuid_dep = dependency('uuid', required: true, fallback : ['uuid', 'uuid_dep'])
5555
conf.set('CONFIG_LIBUUID', libuuid_dep.found(), description: 'Is libuuid required?')
5656

5757
# Check for json-c availability

subprojects/uuid.wrap

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[wrap-git]
2+
url = https://github.com/util-linux/util-linux.git
3+
revision = eefff5aac7bce6979c950e3931a578efe03acbac
4+
5+
[provide]
6+
dependency_names = uuid

0 commit comments

Comments
 (0)