Your message dated Sat, 01 Oct 2016 22:27:37 +0000 with message-id <e1bqskr-0002ty...@franck.debian.org> and subject line Bug#833789: fixed in debhelper 10.1 has caused the Debian Bug report #833789, regarding debhelper: improve cross build support with the cmake buildsystem: multiarch and pkg-config 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 ow...@bugs.debian.org immediately.) -- 833789: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=833789 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
--- Begin Message ---Package: debhelper Version: 9.20160709 Tags: patch User: helm...@debian.org Usertags: rebootstrap Hi Niels et al, Julian was kind enough to prepare an experimental apt release that uses CMake as its build system, so I could get my hands on it and test cross build it. That worked pretty well with two problems both of which we'd like to solve in debhelper. * By default CMake's `find_package(PkgConfig)` will not consider cross tools and default to using plain 'pkg-config'. Since Debian's pkg-config has a proper cross wrapper now, not using the triplet-prefixed means that CMake will fail to find libraries. There are a number of options to tell CMake about the right pkg-config. For instance, setting the environment variable PKG_CONFIG=<triplet>-pkg-config is sufficient. In this patch, we pass it as -DPKG_CONFIG_EXECUTABLE=... to keep consistency with other options. Also note that this variable requires an absolute path. * CMake has logic to place libraries in multiarch paths on Debian systems. That logic is disabled for cross compilation. Thus CMake puts libraries in /usr/lib durin cross compilation, which makes e.g. apt fail to cross build. It's not clear what is the best place to fix this, but debhelper certainly is one where this is possible. Arguably, it's a good place, because CMake has no good way to determine whether the host system will be a Debian system. The patch is joint work with Julian. Helmut--- debhelper-9.20160709/Debian/Debhelper/Buildsystem/cmake.pm +++ debhelper-9.20160709+nmu1/Debian/Debhelper/Buildsystem/cmake.pm @@ -74,6 +74,8 @@ } else { push @flags, "-DCMAKE_CXX_COMPILER=" . dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-g++"; } + push @flags, "-DPKG_CONFIG_EXECUTABLE=/usr/bin/" . pkg_architecture_value("DEB_HOST_GNU_TYPE") . "-pkg-config"; + push @flags, "-DCMAKE_INSTALL_LIBDIR=lib/" . dpkg_architecture_value("DEB_HOST_MULTIARCH"); } # CMake doesn't respect CPPFLAGS, see #653916. --- debhelper-9.20160709/debian/changelog +++ debhelper-9.20160709+nmu1/debian/changelog @@ -1,3 +1,12 @@ +debhelper (9.20160709+nmu1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + + [ Julian Andres Klode and Helmut Grohne] + * Improve cross building for the cmake buildsystem. (Closes: #-1) + + -- Helmut Grohne <hel...@subdivi.de> Mon, 08 Aug 2016 14:57:12 +0200 + debhelper (9.20160709) unstable; urgency=medium * Explicitly Build-Depends on perl:any for pod2man instead
--- End Message ---
--- Begin Message ---Source: debhelper Source-Version: 10.1 We believe that the bug you reported is fixed in the latest version of debhelper, 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 833...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Niels Thykier <ni...@thykier.net> (supplier of updated debhelper 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 ftpmas...@ftp-master.debian.org) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Format: 1.8 Date: Sat, 01 Oct 2016 20:45:27 +0000 Source: debhelper Binary: debhelper dh-systemd Architecture: source all Version: 10.1 Distribution: unstable Urgency: medium Maintainer: Debhelper Maintainers <debhelper-de...@lists.alioth.debian.org> Changed-By: Niels Thykier <ni...@thykier.net> Description: debhelper - helper programs for debian/rules dh-systemd - debhelper add-on to handle systemd unit files - transitional pack Closes: 833789 836988 837585 838446 839389 Changes: debhelper (10.1) unstable; urgency=medium . * Apply patch from Michael Biebl to take over dh-systemd package to ease backporting to jessie-backports. (Closes: #837585) * Apply patch from Helmut Grohne and Julian Andres Klode to improve cross-building support in the cmake build system. (Closes: #833789) * Make the makefile.pm buildsystem (but not subclasses thereof) pass the CC and CXX variables set to the host compilers when cross-building. Thanks to Helmut Grohne for the idea and the initial patch. (Closes: #836988) * dh_md5sums.1: Mention dpkg --verify as a consumer of the output file. Thanks to Guillem Jover for reporting it. * debhelper-obsolete-compat.pod: Add a manpage for the upgrade checklist for all obsolete/removed compat levels. Thanks to Jakub Wilk for the suggestion. * Dh_Getopt,dh_*: Rename --onlyscripts to --only-scripts and --noscripts to --no-scripts for consistency with other options. The old variants are accepted for compatibility. Thanks to Raphaël Hertzog for the suggestion. (Closes: #838446) * cmake.pm: If cmake fails, also down CMakeFiles/CMakeOutput.log and CMakeFiles/CMakeError.log if they are present. Thanks to Michael Banck for the suggestion. (Closes: #839389) * d/copyright: Correct copyright and license of dh_systemd* tools. Checksums-Sha1: 1422d81ff86bfc84d2b258fc92f0119a35999f31 1693 debhelper_10.1.dsc a88bacb82cbd304d745f247ce5cddd31ee14e3c5 353208 debhelper_10.1.tar.xz c7d04aeaa982ae012fb5e083c43b794d787a3faa 741570 debhelper_10.1_all.deb 480b0b2ccd3ef82395d06771396e7ab47aaea0e2 98596 dh-systemd_10.1_all.deb Checksums-Sha256: 6e9989094d188878c635c6932f9b25e52486431512f4b634c136fcae923bff60 1693 debhelper_10.1.dsc 8f6bd9dac7070c0629178aaa6343cd1656a8cbdb8000ada021607f14d3497b09 353208 debhelper_10.1.tar.xz 6f058925424866b08624ded67bac9b0d86af1ba2946d71f665f80c9aa0c2fbb7 741570 debhelper_10.1_all.deb 5b60d93a2c8496ae51b443b22bf55031b6f798e09b0c1f53de0b70d10c38c59c 98596 dh-systemd_10.1_all.deb Files: 2a0a577feab356ed094066ae0cce6b21 1693 devel optional debhelper_10.1.dsc b4201c16a8cd7da87f9a4082cb3e4139 353208 devel optional debhelper_10.1.tar.xz fcbf5222934eec3cb9a07140dec9c784 741570 devel optional debhelper_10.1_all.deb f1adb682b31e7ba750aac5cb7eff1e24 98596 oldlibs extra dh-systemd_10.1_all.deb -----BEGIN PGP SIGNATURE----- iQIcBAEBCAAGBQJX8CDwAAoJEAVLu599gGRC2iIP/AkUCXOJ381AanvqAs31N+Ae K1BUctg2hpgQQrrz3K7qtyiJVl+UtOKFtl7LKC3gnHKy+n+uQTCPOiL2smil5dF0 HIl92COM5nlgZWmw6sOjt2/pHL/RfxjHUpYecwZN48XOQUNpLDtCeW4UFM2JeX/3 SN4hBSddFgRAxCoj7lia7Ix+UXFhsBV5CTLu7Qn6Uxo+SBsYiTI2ZJfw7Fijcc+q ZB4VGbe5LuuRb6VdGnVAVSCOMvXuGCqOY3LrPDGK5cebsH+e19Gu5RmOSukjoGTg ycaL+UTjvtAaJe+m9DEK6oyQcE+Al6o09VszVJBGfXyhdfZx1eB8z8G6nsjOwI85 QunYJflpCa2L90n9ihQ2HTUcF5PsTHjOskKHxI6Hwpe7aq5P06DZzcwJrwrHIx/9 OvVoMFaefQq+m1zS092YcvamcBeAoh+hyl9m4ENmSPzkVSpWlx1kMvrCZsfwKgq1 1l7WprKWYfOpVi52l4QLfqCMpgXpbNWlaRyxvniDBJUOOu9yLJu613jA6JflIJvW qrnDAwPfKnvNoqEV8pGhLYP5ypFWb8AYADqK18muygsmG1dXb9sYsIKZYpeQjeQx supGFctHRLS5A70QYE/6AYf4+rfsufxh2oasF1XtNmmEp1dsYqTssP+qIHJQpS7I IyXBwh3mSbQWU8huuwYm =rS0c -----END PGP SIGNATURE-----
--- End Message ---
