[gnome-build-meta/abderrahim/misc-fixes: 4/6] project.conf: define a runstatedir and use it for krb5 and libvirt

[Marge Bot <marge-bot src gnome org>]

commit 128b025c4320d277e913768a2d867095073f0762
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Sat Mar 20 09:47:59 2021 +0100

    project.conf: define a runstatedir and use it for krb5 and libvirt
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1075>

 elements/core-deps/libvirt.bst | 2 +-
 elements/sdk/krb5.bst          | 2 +-
 project.conf                   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/elements/core-deps/libvirt.bst b/elements/core-deps/libvirt.bst
index 6f7a6f80..5de6713e 100644
--- a/elements/core-deps/libvirt.bst
+++ b/elements/core-deps/libvirt.bst
@@ -35,6 +35,7 @@ depends:
 
 variables:
   meson-local: >-
+    -Drunstatedir=%{runstatedir}
     -Dapparmor=disabled
     -Daudit=disabled
     -Dbash_completion=disabled
@@ -73,7 +74,6 @@ variables:
 config:
   install-commands:
     (>):
-    #- mv %{install-root}/var/run %{install-root}
     - |
       presetdir="$(pkg-config --variable=systemdsystempresetdir systemd)"
       install -Dm644 -t "%{install-root}${presetdir}" 80-libvirt.preset
diff --git a/elements/sdk/krb5.bst b/elements/sdk/krb5.bst
index 8655250b..2c84f2e8 100644
--- a/elements/sdk/krb5.bst
+++ b/elements/sdk/krb5.bst
@@ -25,7 +25,7 @@ variables:
     --host=%{triplet}
     --build=%{triplet}
   conf-local: >-
-    --runstatedir=/run
+    --runstatedir=%{runstatedir}
     --disable-rpath
     --with-system-et
     --with-system-ss
diff --git a/project.conf b/project.conf
index 4bf36122..035e6263 100644
--- a/project.conf
+++ b/project.conf
@@ -299,6 +299,7 @@ variables:
   localstatedir: "/var"
   indep-libdir: "%{prefix}/lib"
   debugdir: "%{indep-libdir}/debug"
+  runstatedir: "/run"
   common_flags: "-O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions 
-fstack-protector-strong -grecord-gcc-switches"
   flags_x86_64: "-march=x86-64 -mtune=generic %{common_flags} -fasynchronous-unwind-tables 
-fstack-clash-protection -fcf-protection %{local_flags}"
   flags_i686: "-march=i686 -mtune=generic -msse2 -mfpmath=sse -mstackrealign %{common_flags} 
-fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection %{local_flags}"