Your message dated Mon, 15 Feb 2021 08:17:09 +0000
with message-id <[email protected]>
and subject line Bug#980335: fixed in sanlock 3.8.2-2
has caused the Debian Bug report #980335,
regarding libsanlock-dev: move libsanlock.pc to a multiarch location
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
980335: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=980335
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: libsanlock-dev
Version: 3.8.2-1
Tags: patch
User: [email protected]
Usertags: ftcbfs
Control: affects -1 + src:libvirt
libvirt cannot be cross built from source, because pkg-config cannot
find libsanlock.pc. In general, pkg-config does not search
/usr/lib/pkgconfig during cross compilation. It only searches
/usr/share/pkgconfig and /usr/lib/<triplet>/pkgconfig. However,
libsanlock-dev places its .pc files where pkg-config does not search.
Please move them. I'm attaching a patch for your convenience.
Helmut
diff --minimal -Nru sanlock-3.8.2/debian/changelog
sanlock-3.8.2/debian/changelog
--- sanlock-3.8.2/debian/changelog 2020-10-01 16:56:30.000000000 +0200
+++ sanlock-3.8.2/debian/changelog 2021-01-17 21:27:13.000000000 +0100
@@ -1,3 +1,10 @@
+sanlock (3.8.2-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use a multiarch libdir. (Closes: #-1)
+
+ -- Helmut Grohne <[email protected]> Sun, 17 Jan 2021 21:27:13 +0100
+
sanlock (3.8.2-1) unstable; urgency=medium
* New upstream release.
diff --minimal -Nru sanlock-3.8.2/debian/libsanlock-client1.install
sanlock-3.8.2/debian/libsanlock-client1.install
--- sanlock-3.8.2/debian/libsanlock-client1.install 2018-01-27
22:21:47.000000000 +0100
+++ sanlock-3.8.2/debian/libsanlock-client1.install 2021-01-17
21:22:33.000000000 +0100
@@ -1,3 +1,3 @@
-usr/lib/libsanlock_client.so.1.0
-usr/lib/libsanlock_client.so.1
+usr/lib/*/libsanlock_client.so.1.0
+usr/lib/*/libsanlock_client.so.1
diff --minimal -Nru sanlock-3.8.2/debian/libsanlock-dev.install
sanlock-3.8.2/debian/libsanlock-dev.install
--- sanlock-3.8.2/debian/libsanlock-dev.install 2020-10-01 16:40:35.000000000
+0200
+++ sanlock-3.8.2/debian/libsanlock-dev.install 2021-01-17 21:26:55.000000000
+0100
@@ -1,5 +1,5 @@
-usr/lib/libsanlock_client.so
-usr/lib/sanlock/libsanlock.so usr/lib
-usr/lib/sanlock/libwdmd.so usr/lib
-usr/lib/pkgconfig
+usr/lib/*/libsanlock_client.so
+usr/lib/*/libsanlock.so
+usr/lib/*/libwdmd.so
+usr/lib/*/pkgconfig
usr/include/*
diff --minimal -Nru sanlock-3.8.2/debian/libsanlock1.install
sanlock-3.8.2/debian/libsanlock1.install
--- sanlock-3.8.2/debian/libsanlock1.install 2020-10-01 12:02:53.000000000
+0200
+++ sanlock-3.8.2/debian/libsanlock1.install 2021-01-17 21:27:13.000000000
+0100
@@ -1 +1,2 @@
-usr/lib/sanlock/*.so.1* usr/lib/
+usr/lib/*/libsanlock.so.1*
+usr/lib/*/libwdmd.so.1*
diff --minimal -Nru sanlock-3.8.2/debian/patches/multiarch.patch
sanlock-3.8.2/debian/patches/multiarch.patch
--- sanlock-3.8.2/debian/patches/multiarch.patch 1970-01-01
01:00:00.000000000 +0100
+++ sanlock-3.8.2/debian/patches/multiarch.patch 2021-01-17
21:27:13.000000000 +0100
@@ -0,0 +1,39 @@
+--- sanlock-3.8.2.orig/src/Makefile
++++ sanlock-3.8.2/src/Makefile
+@@ -101,10 +101,10 @@
+ $(CC) $(CMD_CFLAGS) $(CMD_LDFLAGS) $(CMD_SOURCE) $(CMD_LDADD) -o $@ -L.
+
+ $(LIBPC_ENTIRE_TARGET): $(LIBPC_ENTIRE_SOURCE)
+- sed -e "s/@VERSION@/$(VER)/" $(LIBPC_ENTIRE_SOURCE) >
$(LIBPC_ENTIRE_TARGET)
++ sed -e "s/@VERSION@/$(VER)/" -e 's,@HEADIR@,$(HEADIR),' -e
's,@LIBDIR@,$(LIBDIR),' $(LIBPC_ENTIRE_SOURCE) > $(LIBPC_ENTIRE_TARGET)
+
+ $(LIBPC_CLIENT_TARGET): $(LIBPC_CLIENT_SOURCE)
+- sed -e "s/@VERSION@/$(VER)/" $(LIBPC_CLIENT_SOURCE) >
$(LIBPC_CLIENT_TARGET)
++ sed -e "s/@VERSION@/$(VER)/" -e 's,@HEADIR@,$(HEADIR),' -e
's,@LIBDIR@,$(LIBDIR),' $(LIBPC_CLIENT_SOURCE) > $(LIBPC_CLIENT_TARGET)
+
+ clean:
+ rm -f *.o *.so *.so.* $(CMD_TARGET) $(LIBSO_ENTIRE_TARGET)
$(LIBSO_CLIENT_TARGET) $(LIBPC_ENTIRE_TARGET) $(LIBPC_CLIENT_TARGET)
+--- sanlock-3.8.2.orig/src/libsanlock.pc.in
++++ sanlock-3.8.2/src/libsanlock.pc.in
+@@ -1,7 +1,7 @@
+ prefix=/usr
+ exec_prefix=${prefix}
+-includedir=${prefix}/include
+-libdir=${exec_prefix}/lib
++includedir=@HEADIR@
++libdir=@LIBDIR@
+
+ Name: libsanlock
+ Description: The sanlock library
+--- sanlock-3.8.2.orig/src/libsanlock_client.pc.in
++++ sanlock-3.8.2/src/libsanlock_client.pc.in
+@@ -1,7 +1,7 @@
+ prefix=/usr
+ exec_prefix=${prefix}
+-includedir=${prefix}/include
+-libdir=${exec_prefix}/lib
++includedir=@HEADIR@
++libdir=@LIBDIR@
+
+ Name: libsanlock_client
+ Description: The sanlock client library
diff --minimal -Nru sanlock-3.8.2/debian/patches/series
sanlock-3.8.2/debian/patches/series
--- sanlock-3.8.2/debian/patches/series 2020-10-01 13:53:00.000000000 +0200
+++ sanlock-3.8.2/debian/patches/series 2021-01-17 21:17:13.000000000 +0100
@@ -4,3 +4,4 @@
put_libs_into_dir.patch
python-build.patch
fix_typo.patch
+multiarch.patch
diff --minimal -Nru sanlock-3.8.2/debian/rules sanlock-3.8.2/debian/rules
--- sanlock-3.8.2/debian/rules 2020-10-01 15:48:00.000000000 +0200
+++ sanlock-3.8.2/debian/rules 2021-01-17 21:27:13.000000000 +0100
@@ -2,6 +2,8 @@
#export DH_VERBOSE = 1
+include /usr/share/dpkg/architecture.mk
+
export PY_VERSION = $(shell py3versions -dv)
#LD_LIBRARY_PATH := /usr/lib/sanlock:$(LD_LIBRARY_PATH)
@@ -9,12 +11,14 @@
#LD_LIBRARY_PATH=/usr/lib/sanlock:$(LD_LIBRARY_PATH) dh_shlibdeps
#LD_LIBRARY_PATH := /usr/lib/sanlock
+FLAGS = LIBDIR=/usr/lib/${DEB_HOST_MULTIARCH} LIBDIR_NAME=
+
%:
dh $@ --with python3
override_dh_auto_build:
- dh_auto_build -D wdmd
- dh_auto_build -D src
+ dh_auto_build -D wdmd -- $(FLAGS)
+ dh_auto_build -D src -- $(FLAGS)
dh_auto_build -D python
override_dh_auto_clean:
@@ -28,8 +32,8 @@
dh_auto_configure -D python
override_dh_auto_install:
- dh_auto_install -D wdmd
- dh_auto_install -D src
+ dh_auto_install -D wdmd -- $(FLAGS)
+ dh_auto_install -D src -- $(FLAGS)
dh_auto_install -D python
override_dh_makeshlibs:
--- End Message ---
--- Begin Message ---
Source: sanlock
Source-Version: 3.8.2-2
Done: Håvard Flaget Aasen <[email protected]>
We believe that the bug you reported is fixed in the latest version of
sanlock, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Håvard Flaget Aasen <[email protected]> (supplier of updated sanlock
package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Thu, 11 Feb 2021 17:09:13 +0100
Source: sanlock
Architecture: source
Version: 3.8.2-2
Distribution: unstable
Urgency: medium
Maintainer: Håvard Flaget Aasen <[email protected]>
Changed-By: Håvard Flaget Aasen <[email protected]>
Closes: 980335
Changes:
sanlock (3.8.2-2) unstable; urgency=medium
.
* d/control: Drop Built-Using field, for Python3 package.
* Move libraries and pkg-config to a multiarch location Closes: #980335
Thanks to Helmut Grohne for patch.
* Move Python example file to correct folder.
* Change section for the binary package sanlock, from libs to utils.
* Remove libblkid1 as build-dependency.
Checksums-Sha1:
20c5729f76b59cecf7d1a8d535a524b289bd00b4 2012 sanlock_3.8.2-2.dsc
fba35f7559bfdca8b6253ca9175bf6b7b42a62fe 10220 sanlock_3.8.2-2.debian.tar.xz
6b8d233f82b53e5b19cd82b06142f58679357889 6239 sanlock_3.8.2-2_source.buildinfo
Checksums-Sha256:
d39edeef276a9051b28b3d18c53ad50ce51d6b0a263717d248aab310998550d1 2012
sanlock_3.8.2-2.dsc
1d19add29cc33a3400b1cc07cb172f38acb76d10ce757c1f8fa1bf905dffce56 10220
sanlock_3.8.2-2.debian.tar.xz
812e1149906d762b95a6f96e3293b9ee1d37181b6a86f285f723a9cce8fc3f0d 6239
sanlock_3.8.2-2_source.buildinfo
Files:
fd1a6acb654d87715983aa44f8894ab6 2012 libs optional sanlock_3.8.2-2.dsc
beadc84033aee0a87708c3c630b506f4 10220 libs optional
sanlock_3.8.2-2.debian.tar.xz
839a62008fc436106dd709d57d19d920 6239 libs optional
sanlock_3.8.2-2_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEkjZVexcMh/iCHArDweDZLphvfH4FAmAqJasACgkQweDZLphv
fH7YjxAAgrP3SjnbtAx/896e6HzvKNRZgs+z6BdRd0efmWQL6aM4M+ncsS/Mygby
tvQYlVd7DslVPd5WspdFPLL9XNbBgzFoC5HaNCeJPOJXDmJ4WCuJEOuZyuPZrJd/
NScXCTRI9m9C4IakylPuTqRlupBO56HwUrZ3JFDZXOXIIOiSfvFuq8awUx9uv0qb
jQrMpE+PsRudytvZAVlwRVsUF3r9agTubuKPOvTX6IK27tlIt1QLbqSjaAvIX/Ft
DOCvtO5F0417OrS0M5jFL/m8Jkrx72RKX+IyeIGcacbfejikk4AfucCImgweEqv6
aNJ6oecoh2HmMj4gJswWMmmOe7khiyvwqTDRiaNS7d7icRr3eAxaacTE6rO+c/DU
a9C9z9NjCXuYEttgRY3KlksdX7u+kCd4mUZ62LiDHyWRsiMM/E3/S3vHu0xBKb69
h6QPnyT9wHY5DFBDhdj9t/d8L4WpgjE8rzaCaVSNAOf/ceDG3DS53HZ6MyM68lpP
ASY51NlxaFF/a9DuGeCdsPmHd33b22vxb2l5FDOoANPcTzpvKYWAwTwnB427MAVB
ueTw6Q2d1sK42Z8YLMPnDeR6vYdOrfqsuQN7F5LSW2SYYQdfGqW8muLzeOK72e9v
JsbW+tYPqN22dR3DGQkES8YjtGi5LYkiP40+cOs/l2ZAyWt9M6U=
=Fvnn
-----END PGP SIGNATURE-----
--- End Message ---
