From bfa24c12a5b71b5652d7427817c8f3f8b787fd4f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 5 Mar 2018 07:08:18 +0100 Subject: [PATCH] meson: set multiple output dirs in setup hook Closes: #32636 --- .../development/tools/build-managers/meson/setup-hook.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh index 341b1ff9e6e..36a7fe23ef5 100644 --- a/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh @@ -10,6 +10,15 @@ mesonConfigurePhase() { crossMesonFlags="--cross-file=@crossFile@/cross-file.conf" fi + # See multiple-outputs.sh and meson’s coredata.py + mesonFlags="\ + --libdir=${!outputLib}/lib --libexecdir=${!outputLib}/libexec \ + --bindir=${!outputBin}/bin --sbindir=${!outputBin}/sbin \ + --includedir=${!outputInclude}/include \ + --mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \ + --localedir=${!outputLib}/share/locale \ + $mesonFlags" + mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-release} $mesonFlags" echo "meson flags: $mesonFlags ${mesonFlagsArray[@]}"