Package: libhbaapi-dev
Version: 2.2.9-2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
Control: affects -1 + src:libhbalinux
libhbalinux fails to cross build from source, because it cannot find
HBAAPI.pc. During cross compilation, pkg-config does not search
/usr/lib/pkgconfig. It only searches /usr/lib/<triplet>/pkgconfig and
/usr/share/pkgconfig. Please move HBAAPI.pc to a multiarch location. The
attached patch implements that.
Helmut
diff --minimal -Nru libhbaapi-2.2.9/debian/changelog
libhbaapi-2.2.9/debian/changelog
--- libhbaapi-2.2.9/debian/changelog 2018-05-28 01:20:26.000000000 +0200
+++ libhbaapi-2.2.9/debian/changelog 2020-02-22 09:55:54.000000000 +0100
@@ -1,3 +1,9 @@
+libhbaapi (2.2.9-3) UNRELEASED; urgency=medium
+
+ * Move HBAAPI.pc to a multiarch location. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Sat, 22 Feb 2020 09:55:54 +0100
+
libhbaapi (2.2.9-2) unstable; urgency=medium
* QA upload.
diff --minimal -Nru libhbaapi-2.2.9/debian/libhbaapi-dev.dirs
libhbaapi-2.2.9/debian/libhbaapi-dev.dirs
--- libhbaapi-2.2.9/debian/libhbaapi-dev.dirs 2018-05-28 01:15:10.000000000
+0200
+++ libhbaapi-2.2.9/debian/libhbaapi-dev.dirs 2020-02-22 09:55:54.000000000
+0100
@@ -1,3 +1 @@
usr/include
-usr/lib
-usr/lib/pkgconfig
diff --minimal -Nru libhbaapi-2.2.9/debian/libhbaapi-dev.install
libhbaapi-2.2.9/debian/libhbaapi-dev.install
--- libhbaapi-2.2.9/debian/libhbaapi-dev.install 2018-05-28
01:15:10.000000000 +0200
+++ libhbaapi-2.2.9/debian/libhbaapi-dev.install 2020-02-22
09:55:54.000000000 +0100
@@ -1,4 +1,4 @@
-/usr/lib/pkgconfig/* usr/lib/pkgconfig/
+/usr/lib/*/pkgconfig/*
usr/include/* usr/include/
-usr/lib/*.la usr/lib/
-usr/lib/lib*.so usr/lib/
+usr/lib/*/*.la
+usr/lib/*/lib*.so
diff --minimal -Nru libhbaapi-2.2.9/debian/libhbaapi2.install
libhbaapi-2.2.9/debian/libhbaapi2.install
--- libhbaapi-2.2.9/debian/libhbaapi2.install 2018-05-28 01:15:10.000000000
+0200
+++ libhbaapi-2.2.9/debian/libhbaapi2.install 2020-02-22 09:55:54.000000000
+0100
@@ -1,2 +1,2 @@
usr/etc/hba.conf etc/
-usr/lib/lib*.so.* usr/lib/
+usr/lib/*/lib*.so.*
diff --minimal -Nru libhbaapi-2.2.9/debian/rules libhbaapi-2.2.9/debian/rules
--- libhbaapi-2.2.9/debian/rules 2018-05-28 01:13:22.000000000 +0200
+++ libhbaapi-2.2.9/debian/rules 2020-02-22 09:55:51.000000000 +0100
@@ -2,6 +2,8 @@
DEB_CONFIGURE_EXTRA_FLAGS := --disable-static
+include /usr/share/dpkg/architecture.mk
+
# For Hardening
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DPKG_EXPORT_BUILDFLAGS = 1
@@ -14,4 +16,4 @@
override_dh_auto_configure:
[ ! -f hbaapi_src_2.2.tgz ] || tar -C . -zvxf hbaapi_src_2.2.tgz
--strip-components=1
./bootstrap.sh
- ./configure --disable-static --prefix=/usr
+ ./configure --disable-static --prefix=/usr
--libdir='$${prefix}/lib/${DEB_HOST_MULTIARCH}'
