Your message dated Tue, 13 Aug 2024 13:04:04 +0000
with message-id <e1sdrc0-008tuj...@fasolo.debian.org>
and subject line Bug#1077673: fixed in debhelper 13.17
has caused the Debian Bug report #1077673,
regarding debhelper: cmake buildsystem: update pkg-config passing method
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.)
--
1077673: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1077673
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: debhelper
Version: 13.16
Tags: patch
Control: affects -1 + cmake src:qt6-connectivity
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
X-Debbugs-Cc: Debian CMake Team <pkg-cmake-t...@lists.alioth.debian.org>
cmake changed its way of communicating pkg-config again. The earlier
method of passing -DPKGCONFIG_EXECUTABLE and later
-DPKG_CONFIG_EXECUTABLE are no longer honoured in version 3.30. However,
it now accepts an environment variable PKG_CONFIG. Let's also set that.
I know this is getting ridiculous, but what is our choice?
The attached patch goes slightly beyond and refactors a bit of code
duplication. Hope that's ok.
Helmut
diff --minimal -Nru debhelper-13.16/debian/changelog
debhelper-13.16+nmu1/debian/changelog
--- debhelper-13.16/debian/changelog 2024-06-17 18:00:40.000000000 +0200
+++ debhelper-13.16+nmu1/debian/changelog 2024-07-31 11:42:31.000000000
+0200
@@ -1,3 +1,10 @@
+debhelper (13.16+nmu1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * cmake: Also pass pkg-config via environment (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Wed, 31 Jul 2024 11:42:31 +0200
+
debhelper (13.16) unstable; urgency=medium
[ Niels Thykier ]
diff --minimal -Nru debhelper-13.16/lib/Debian/Debhelper/Buildsystem/cmake.pm
debhelper-13.16+nmu1/lib/Debian/Debhelper/Buildsystem/cmake.pm
--- debhelper-13.16/lib/Debian/Debhelper/Buildsystem/cmake.pm 2024-03-17
08:20:54.000000000 +0100
+++ debhelper-13.16+nmu1/lib/Debian/Debhelper/Buildsystem/cmake.pm
2024-07-31 11:42:31.000000000 +0200
@@ -79,9 +79,15 @@
return $this;
}
+sub _get_pkgconf {
+ my $toolprefix = is_cross_compiling() ?
dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-" : "";
+ return "/usr/bin/" . $toolprefix . "pkg-config";
+}
+
sub _get_cmake_env {
my $update_env = {};
$update_env->{DEB_PYTHON_INSTALL_LAYOUT} = 'deb' unless
$ENV{DEB_PYTHON_INSTALL_LAYOUT};
+ $update_env->{PKG_CONFIG} = _get_pkgconf() unless $ENV{PKG_CONFIG};
return $update_env;
}
@@ -129,8 +135,8 @@
if (not $ENV{CXX}) {
push @flags, "-DCMAKE_CXX_COMPILER=" .
dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-g++";
}
- push(@flags, "-DPKG_CONFIG_EXECUTABLE=/usr/bin/" .
dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-pkg-config");
- push(@flags, "-DPKGCONFIG_EXECUTABLE=/usr/bin/" .
dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-pkg-config");
+ push(@flags, "-DPKG_CONFIG_EXECUTABLE=" . _get_pkgconf());
+ push(@flags, "-DPKGCONFIG_EXECUTABLE=" . _get_pkgconf());
push(@flags, "-DQMAKE_EXECUTABLE=/usr/bin/" .
dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-qmake");
}
push(@flags, "-DCMAKE_INSTALL_LIBDIR=lib/" .
dpkg_architecture_value("DEB_HOST_MULTIARCH"));
--- End Message ---
--- Begin Message ---
Source: debhelper
Source-Version: 13.17
Done: Niels Thykier <ni...@thykier.net>
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 1077...@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: SHA512
Format: 1.8
Date: Tue, 13 Aug 2024 12:21:03 +0000
Source: debhelper
Architecture: source
Version: 13.17
Distribution: unstable
Urgency: medium
Maintainer: Debhelper Maintainers <debhel...@packages.debian.org>
Changed-By: Niels Thykier <ni...@thykier.net>
Closes: 981783 982457 1074322 1077673
Changes:
debhelper (13.17) unstable; urgency=medium
.
[ Américo Monteiro ]
* Update on Portuguese translation of man pages
.
[ Niels Thykier ]
* Reorder default sequence around dh_fixperms and nearby tools in
compat 14. (Closes: #981783, #982457). This should also avoid
future issues like LP#1928381 where Ubuntu's modifications to
`dh_strip` cause differences not visible in Debian.
* dh_assistant: Fix bug the config introspection could be wrong.
* debhelper-documentation.json: Associate with `substvars` with
`dh_gencontrol`.
* Add some config hints to `dh_makeshlibs` and `dh_gencontrol`.
* Bump Standards-Version to 4.7.0 - no changes required
* Dh_Lib.pm: Change `pkgfile` lookup to have opt-in features
rather than always-on in compat 14. Third-party debhelper tools
should update their `pkgfile` calls if they need `named` or/and
architecture specifc configuration files.
* Set PKG_CONFIG when calling Makefile.pl (makemaker) if not already set
* Make `dh_auto_install --destdir` change a pure compat 14 change.
Thanks to Jeremy Bícha <jeremy.bi...@canonical.com>.
(Closes: #1074322)
.
[ Jean-Pierre Giraud ]
* Update French manpage translation
.
[ Helmut Grohne ]
* cmake.pm: Also pass pkg-config via environment (Closes: #1077673)
Checksums-Sha1:
c0c299e1521a868e844f4e202d5ad279abed6fd6 1576 debhelper_13.17.dsc
66bd86ddb639a9077d782c368794eced45331322 615044 debhelper_13.17.tar.xz
Checksums-Sha256:
723643506a243c1e6e0f716c6611616a8ec3791e8107306aa83c54ec2248a4d9 1576
debhelper_13.17.dsc
f30edbeb7fc7d411002816339d5beaf59bc2ab74f840a2f70fc9035070ad2dc7 615044
debhelper_13.17.tar.xz
Files:
79564dd16c4d015d394b4d16f3fb65ad 1576 devel optional debhelper_13.17.dsc
51c0a7490f3ad2044799b4d89c95079a 615044 devel optional debhelper_13.17.tar.xz
-----BEGIN PGP SIGNATURE-----
iQFGBAEBCgAwFiEE9ecZmu9eXGflVYc/dA1oiINl0okFAma7U5YSHG5pZWxzQHRo
eWtpZXIubmV0AAoJEHQNaIiDZdKJEZUH/3mHfZsIr5SIY1w1MvAwrHiYirg791MP
MXLW5owTxxTQk2QFQosONOyDg1BWCylTa5RFXChSxeTo+x02yi11gsl93s8rjinR
HffVhYem9jYHXTmnbOUBet2F/SivxKrkuLnr7crLYxuVaw0nLqZRnWuYK7zkXsBS
R1xl/eI0I+ovuSaTiF4c+ftV9/gGumU8J1t9VRH0P0Y19m7zrsNkmz0JTnpZ5Uhp
CTDKgOJRRqOfqu8GEvAfkODVlxyf0WPgpN/BHirho0d8GNayOD7G7F9nn2HTN8Is
05jI997bSMMjHdokrSe3OQooI+gQMIztItXA4OVZwpMosVVWyU1v8jU=
=JL3O
-----END PGP SIGNATURE-----
pgp4XEaWilmqt.pgp
Description: PGP signature
--- End Message ---
