[jhbuild] meson: Set libdir to avoid the Debian multiarch autodetection

[Emanuele Aina <emaaa src gnome org>]

commit 1d2e3e9c1f73d51d8553f2b9fde8594baa1ad277
Author: Emanuele Aina <emanuele aina collabora com>
Date:   Tue Sep 27 16:02:17 2016 +0200

    meson: Set libdir to avoid the Debian multiarch autodetection
    
    Meson uses `dpkg-architecture -qDEB_HOST_MULTIARCH` on Debian-derived
    distributions to detect the multiarch-enabled directory where to install
    libraries.
    
    JHBuild does not uses that and makes Meson-built packages unreachable
    from a ld.so and pkg-config standpoint when used on multiarch-enabled
    Debian-derived distributions.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=772061

 jhbuild/modtypes/meson.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/jhbuild/modtypes/meson.py b/jhbuild/modtypes/meson.py
index ad5a935..932bdbe 100644
--- a/jhbuild/modtypes/meson.py
+++ b/jhbuild/modtypes/meson.py
@@ -55,6 +55,9 @@ class MesonModule(MakeModule, DownloadableModule):
         args = args.replace('${libsuffix}', '')
         return args
 
+    def get_libdir(self):
+        return 'lib'
+
     def get_srcdir(self, buildscript):
         return self.branch.srcdir
 
@@ -83,7 +86,7 @@ class MesonModule(MakeModule, DownloadableModule):
         prefix = os.path.expanduser(buildscript.config.prefix)
         if not inpath('meson', os.environ['PATH'].split(os.pathsep)):
             raise CommandError(_('%s not found') % 'meson')
-        baseargs = '--prefix %s' % prefix
+        baseargs = '--prefix %s --libdir %s' % (prefix, self.get_libdir())
         mesonargs = self.get_mesonargs()
         cmd = 'meson %s %s %s' % (baseargs, mesonargs, srcdir)
         buildscript.execute(cmd, cwd=builddir, extra_env=self.extra_env)