Package: valgrind
Version: 1:3.13.0-1
Tags: patch
Control: affects -1 + src:gnome-software
User: helm...@debian.org
Usertags: rebootstrap
gnome-software fails to cross build from source, because pkg-config
fails to find valgrind.pc. During cross compilation, pkg-config does not
consider /usr/lib/pkgconfig and only considers /usr/share/pkgconfig and
/usr/lib/<triplet>/pkgconfig. Thus the valgrind.pc needs to be placed
into a multiarchy location. Please consider applying the attached patch.
Helmut
diff --minimal -Nru valgrind-3.13.0/debian/changelog
valgrind-3.13.0/debian/changelog
--- valgrind-3.13.0/debian/changelog 2017-07-24 01:41:05.000000000 +0200
+++ valgrind-3.13.0/debian/changelog 2017-12-22 20:18:00.000000000 +0100
@@ -1,3 +1,10 @@
+valgrind (1:3.13.0-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Multiarchify pkg-config file. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Fri, 22 Dec 2017 20:18:00 +0100
+
valgrind (1:3.13.0-1) unstable; urgency=medium
* New upstream release
diff --minimal -Nru valgrind-3.13.0/debian/rules valgrind-3.13.0/debian/rules
--- valgrind-3.13.0/debian/rules 2017-07-24 01:41:05.000000000 +0200
+++ valgrind-3.13.0/debian/rules 2017-12-22 20:17:58.000000000 +0100
@@ -3,6 +3,8 @@
# valgrind uses -fno-stack-protector
export DEB_BUILD_MAINT_OPTIONS :=
hardening=-stackprotector,-stackprotectorstrong
+include /usr/share/dpkg/architecture.mk
+
CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
CFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
CFLAGS += "-I/usr/include/$(DEB_HOST_GNU_TYPE)" # fixes #676029
@@ -36,6 +38,9 @@
# valgrind script
mv -f $(target)/usr/bin/valgrind $(target)/usr/bin/valgrind.bin
mv -f ${target}/usr/bin/valgrind.sh $(target)/usr/bin/valgrind
+ # multiarchify pkg-config
+ mkdir -p ${target}/usr/lib/$(DEB_HOST_MULTIARCH)
+ mv -f $(target)/usr/lib/pkgconfig
$(target)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
override_dh_installchangelogs:
dh_installchangelogs NEWS
