Commit 50f90818 authored by Carlos Soriano 's avatar Carlos Soriano

Merge branch 'meson-disablers-not-what-i-thought-them-to-be' into 'master'

build: drop use of disabler object

See merge request !50
parents 70ac3742 5996435d
Pipeline #1813 canceled with stage
......@@ -18,20 +18,6 @@
],
"cleanup": [ "/include", "/share/bash-completion" ],
"modules": [
{
"name": "meson",
"buildsystem": "simple",
"build-commands": [
"python3 setup.py install --prefix=/app"
],
"sources": [
{
"type": "archive",
"url": "https://github.com/mesonbuild/meson/releases/download/0.44.0/meson-0.44.0.tar.gz",
"sha256": "50f9b12b77272ef6ab064d26b7e06667f07fa9f931e6a20942bba2216ba4281b"
}
]
},
{
"name": "exiv2",
"sources": [
......
project('nautilus', 'c',
version: '3.27.2',
meson_version: '>= 0.44.0',
meson_version: '>= 0.41.0',
license: 'GPL3+'
)
......@@ -51,7 +51,7 @@ gmodule = dependency('gmodule-no-export-2.0', version: glib_ver)
gnome_autoar = dependency('gnome-autoar-0', version: '>= 0.2.1')
gnome_desktop = dependency('gnome-desktop-3.0', version: '>= 3.0.0')
gtk = dependency('gtk+-3.0', version: '>= 3.22.26')
selinux = disabler()
selinux = []
if get_option('selinux')
selinux = dependency('libselinux', version: '>= 2.0')
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment