Control: tags -1 + patch On Tue, 17 Dec 2019 at 14:55:58 +0000, Simon McVittie wrote: > If you have a mixture of (for example) x86_64 and i386 binaries, it is not > currently possible to preload libnss-wrapper for both, because it's > installed as /usr/lib/libnss_wrapper.so which can only be for one > architecture or the other. > > This is hopefully straightforward to fix. I'll send patches when I have > a bug number.
It was as straightforward as I'd hoped. Please see attached, also available as <https://salsa.debian.org/sssd-team/nss-wrapper/merge_requests/2>. Please also consider <https://salsa.debian.org/sssd-team/nss-wrapper/merge_requests/1> (which fixes the VCS metadata). Thanks, smcv
>From 98224dc219f7be7fb95fe49333d316973c07e081 Mon Sep 17 00:00:00 2001 From: Simon McVittie <s...@debian.org> Date: Tue, 17 Dec 2019 14:49:57 +0000 Subject: [PATCH] Allow installation for more than one architecture at the same time - d/rules: Install in /usr/lib/$(DEB_HOST_MULTIARCH) - d/control: Set Multi-Arch: same Closes: #946902 --- debian/changelog | 9 +++++++++ debian/control | 1 + debian/libnss-wrapper.lintian-overrides | 2 +- debian/rules | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d637a9d..9ec4364 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +nss-wrapper (1.1.3-2) UNRELEASED; urgency=medium + + * Allow installation for more than one architecture at the same time + - d/rules: Install in /usr/lib/$(DEB_HOST_MULTIARCH) + - d/control: Set Multi-Arch: same + (Closes: #946902) + + -- Simon McVittie <s...@debian.org> Tue, 17 Dec 2019 14:47:55 +0000 + nss-wrapper (1.1.3-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index 7fdb946..d9006dc 100644 --- a/debian/control +++ b/debian/control @@ -17,6 +17,7 @@ Vcs-Browser: https://anonscm.debian.org/git/pkg-sssd/nss-wrapper.git Package: libnss-wrapper Architecture: any +Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} Description: NSS wrapper library There are projects which provide daemons needing to be able to create, modify diff --git a/debian/libnss-wrapper.lintian-overrides b/debian/libnss-wrapper.lintian-overrides index 426370b..0e50e29 100644 --- a/debian/libnss-wrapper.lintian-overrides +++ b/debian/libnss-wrapper.lintian-overrides @@ -1,3 +1,3 @@ # libnss_wrapper is a preloadable library. # We do not support directly linking to it, so it doesn't need the SONAME. -libnss-wrapper: sharedobject-in-library-directory-missing-soname usr/lib/libnss_wrapper.so +libnss-wrapper: sharedobject-in-library-directory-missing-soname usr/lib/*/libnss_wrapper.so diff --git a/debian/rules b/debian/rules index 565682d..c211933 100755 --- a/debian/rules +++ b/debian/rules @@ -10,6 +10,7 @@ cmake_options = \ -DCMAKE_C_FLAGS="$(cflags)" \ -DCMAKE_SHARED_LINKER_FLAGS="$(ldflags)" \ -DCMAKE_EXE_LINKER_FLAGS="$(ldflags)" \ + -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) \ ifeq "$(filter nocheck,$(DEB_BUILD_OPTIONS))" "" cmake_options += \ -- 2.24.1
