upstream: use enabled/disabled instead of true/false for features

systemd · Jan 9, 2024 · 9a3abfa · 9a3abfa
1 parent f8cc3a0
commit 9a3abfa
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/agent/bootstrap-alt.sh b/agent/bootstrap-alt.sh
@@ -232,7 +232,7 @@ fi
         -Dtests=unsafe \
         -Dinstall-tests=true \
         -Ddbuspolicydir=/etc/dbus-1/system.d \
-        -Dman=false \
+        -Dman=disabled \
         -Db_sanitize=address,undefined \
         -Db_lundef=false # See https://github.com/mesonbuild/meson/issues/764
     ninja -C "$BUILD_DIR"

diff --git a/agent/bootstrap.sh b/agent/bootstrap.sh
@@ -208,8 +208,8 @@ fi
         -Dtests=unsafe \
         -Dinstall-tests=true \
         -Ddbuspolicydir=/etc/dbus-1/system.d \
-        -Dman=true \
-        -Dhtml=true
+        -Dman=enabled \
+        -Dhtml=enabled
     ninja -C "$BUILD_DIR"
 ) 2>&1 | tee "$LOGDIR/build.log"
 

diff --git a/vagrant/bootstrap_scripts/arch-sanitizers-clang.sh b/vagrant/bootstrap_scripts/arch-sanitizers-clang.sh
@@ -90,7 +90,7 @@ meson setup "$BUILD_DIR" \
       -Dinstall-tests=true \
       -Ddbuspolicydir=/usr/share/dbus-1/system.d \
       -Dlocalegen-path=/usr/bin/locale-gen \
-      -Dman=false \
+      -Dman=disabled \
       -Db_sanitize=address,undefined \
       -Db_lundef=false # See https://github.com/mesonbuild/meson/issues/764
 ninja -C "$BUILD_DIR"

diff --git a/vagrant/bootstrap_scripts/arch-sanitizers-gcc.sh b/vagrant/bootstrap_scripts/arch-sanitizers-gcc.sh
@@ -65,7 +65,7 @@ meson setup "$BUILD_DIR" \
       -Dinstall-tests=true \
       -Ddbuspolicydir=/usr/share/dbus-1/system.d \
       -Dlocalegen-path=/usr/bin/locale-gen \
-      -Dman=false \
+      -Dman=disabled \
       -Db_sanitize=address,undefined
 ninja -C "$BUILD_DIR"
 

diff --git a/vagrant/bootstrap_scripts/arch.sh b/vagrant/bootstrap_scripts/arch.sh
@@ -52,8 +52,8 @@ meson setup "$BUILD_DIR" \
       -Ddbuspolicydir=/usr/share/dbus-1/system.d \
       -Dlocalegen-path=/usr/bin/locale-gen \
       $(grep -q default-network meson_options.txt && echo -Ddefault-network=true) \
-      -Dman=true \
-      -Dhtml=true
+      -Dman=enabled \
+      -Dhtml=enabled
 ninja -C "$BUILD_DIR"
 ninja -C "$BUILD_DIR" install