diff options
| author | Matthieu Herrb <matthieu@herrb.eu> | 2024-03-30 11:10:08 +0100 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2024-03-30 11:10:08 +0100 |
| commit | 1161c6d8665a55e80ab247c4f0da09b5765825d1 (patch) | |
| tree | 55cf1255dab650730459a44830d0cf0850b54075 | |
| parent | baf7bc8af639e03729f2c0a17a6aa303964ce3df (diff) | |
| parent | 2ec2576cabefef1eaa5dd9307c97de2e887fc347 (diff) | |
Merge remote-tracking branch 'origin/master' into obsd
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/meson.build | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bcb75cf..185edc2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,7 +91,7 @@ meson: - MESON_OPTIONS: ['-Dzlib=disabled', '-Dzlib=enabled'] script: - mkdir -p ../_inst - - meson setup builddir --prefix="$PWD/../_inst" -Dwarning_level=3 $MESON_OPTIONS + - meson setup builddir --prefix="$PWD/../_inst" -Dwarning_level=3 -Ddefault_library=both $MESON_OPTIONS - meson configure builddir - ninja -C builddir test - ninja -C builddir install diff --git a/meson.build b/meson.build index b5b54a4..f004d3f 100644 --- a/meson.build +++ b/meson.build @@ -21,7 +21,7 @@ project( 'libpciaccess', ['c'], - version : '0.18', + version : '0.18.1', license : 'MIT', meson_version : '>= 0.48.0', default_options : ['buildtype=debugoptimized'], diff --git a/src/meson.build b/src/meson.build index 24eee04..e319688 100644 --- a/src/meson.build +++ b/src/meson.build @@ -38,7 +38,7 @@ endif inc_src = include_directories('.') -libpciaccess = shared_library( +libpciaccess = library( 'pciaccess', [ 'common_bridge.c', |