zfs-patches/0017-Fix-default-libdir-for-Debian-Ubuntu.patch

   1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
   2 From: Brian Behlendorf <behlendorf1@llnl.gov>
   3 Date: Mon, 5 Feb 2018 20:42:52 -0800
   4 Subject: [PATCH] Fix default libdir for Debian/Ubuntu
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 The distribution provided architecture specific RPM macro files
  10 for x86_64 and other architectures on Debian/Ubuntu specify the
  11 wrong default libdir install location.  When building deb packages
  12 override _lib with the correct location.
  13
  14 Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
  15 Reviewed-by: loli10K <ezomori.nozomu@gmail.com>
  16 Reviewed by: George Melikov <mail@gmelikov.ru>
  17 Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
  18 Closes #7083
  19 Closes #7101
  20 (cherry picked from commit f1dde3fb20eb27c05b57ad82e0905a587ced8ee8)
  21 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  22 ---
  23  config/zfs-build.m4 | 13 +++++++++++++
  24  1 file changed, 13 insertions(+)
  25
  26 diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
  27 index 5eaa49c87..7c19cecd6 100644
  28 --- a/config/zfs-build.m4
  29 +++ b/config/zfs-build.m4
  30 @@ -164,6 +164,19 @@ AC_DEFUN([ZFS_AC_RPM], [
  31         RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)" --define "require_spldir $(SPL)" --define "require_splobj $(SPL_OBJ)" --define "ksrc $(LINUX)" --define "kobj $(LINUX_OBJ)"'
  32         RPM_DEFINE_DKMS=
  33
  34 +       dnl # Override default lib directory on Debian/Ubuntu systems.  The provided
  35 +       dnl # /usr/lib/rpm/platform/<arch>/macros files do not specify the correct
  36 +       dnl # path for multiarch systems as described by the packaging guidelines.
  37 +       dnl #
  38 +       dnl # https://wiki.ubuntu.com/MultiarchSpec
  39 +       dnl # https://wiki.debian.org/Multiarch/Implementation
  40 +       dnl #
  41 +       AS_IF([test "$DEFAULT_PACKAGE" = "deb"], [
  42 +               MULTIARCH_LIBDIR="lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
  43 +               RPM_DEFINE_UTIL+=' --define "_lib $(MULTIARCH_LIBDIR)"'
  44 +               AC_SUBST(MULTIARCH_LIBDIR)
  45 +       ])
  46 +
  47         SRPM_DEFINE_COMMON='--define "build_src_rpm 1"'
  48         SRPM_DEFINE_UTIL=
  49         SRPM_DEFINE_KMOD=
  50 --
  51 2.14.2
  52