diff options
| author | Brian Behlendorf <[email protected]> | 2018-02-05 20:42:52 -0800 |
|---|---|---|
| committer | Tony Hutter <[email protected]> | 2018-03-14 16:10:36 -0700 |
| commit | f1dde3fb20eb27c05b57ad82e0905a587ced8ee8 (patch) | |
| tree | 1283dec1c59317fb7a753ee4814887d097d8bbf8 | |
| parent | 5f38142e7b3a8994afef60faa2e65d72e7993807 (diff) | |
Fix default libdir for Debian/Ubuntu
The distribution provided architecture specific RPM macro files
for x86_64 and other architectures on Debian/Ubuntu specify the
wrong default libdir install location. When building deb packages
override _lib with the correct location.
Reviewed-by: Giuseppe Di Natale <[email protected]>
Reviewed-by: loli10K <[email protected]>
Reviewed by: George Melikov <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #7083
Closes #7101
| -rw-r--r-- | config/zfs-build.m4 | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 index 5eaa49c87..7c19cecd6 100644 --- a/config/zfs-build.m4 +++ b/config/zfs-build.m4 @@ -164,6 +164,19 @@ AC_DEFUN([ZFS_AC_RPM], [ RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)" --define "require_spldir $(SPL)" --define "require_splobj $(SPL_OBJ)" --define "ksrc $(LINUX)" --define "kobj $(LINUX_OBJ)"' RPM_DEFINE_DKMS= + dnl # Override default lib directory on Debian/Ubuntu systems. The provided + dnl # /usr/lib/rpm/platform/<arch>/macros files do not specify the correct + dnl # path for multiarch systems as described by the packaging guidelines. + dnl # + dnl # https://wiki.ubuntu.com/MultiarchSpec + dnl # https://wiki.debian.org/Multiarch/Implementation + dnl # + AS_IF([test "$DEFAULT_PACKAGE" = "deb"], [ + MULTIARCH_LIBDIR="lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)" + RPM_DEFINE_UTIL+=' --define "_lib $(MULTIARCH_LIBDIR)"' + AC_SUBST(MULTIARCH_LIBDIR) + ]) + SRPM_DEFINE_COMMON='--define "build_src_rpm 1"' SRPM_DEFINE_UTIL= SRPM_DEFINE_KMOD= |