From: Mike Gilbert <floppym@gentoo.org>
Date: Tue, 7 Jun 2022 00:55:45 +0000 (-0400)
Subject: meson: adjust rootlibdir default for multiarch
X-Git-Tag: v252-rc1~861
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e91119c3a4f3035c96e34354bc2016c4cacf067f;p=thirdparty%2Fsystemd.git

meson: adjust rootlibdir default for multiarch

On Debian, libdir is commonly something like 'lib/x86_64-linux-gnu'.

The result of get_option('libdir') is normalized to a prefix-relative
path by meson, so we can just append it to rootprefixdir.

Fixes https://github.com/systemd/systemd/issues/23648.
---

diff --git a/meson.build b/meson.build
index ce2d9679b4c..2daaf3f4000 100644
--- a/meson.build
+++ b/meson.build
@@ -144,7 +144,12 @@ rootlibexecdir = rootprefixdir / 'lib/systemd'
 
 rootlibdir = get_option('rootlibdir')
 if rootlibdir == ''
-        rootlibdir = rootprefixdir / libdir.split('/')[-1]
+        # This will be a relative path if libdir is in prefix.
+        rootlibdir = get_option('libdir')
+endif
+if not rootlibdir.startswith('/')
+        # If we have a relative path, add rootprefixdir to the front.
+        rootlibdir = rootprefixdir / rootlibdir
 endif
 rootpkglibdir = rootlibdir / 'systemd'