Package: libsanlock-dev
Version: 3.8.2-1
Tags: patch
User: debian-cr...@lists.debian.org
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 <hel...@subdivi.de> 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:
