Your message dated Tue, 13 Aug 2019 15:06:50 +0000
with message-id <[email protected]>
and subject line Bug#933560: fixed in glib2.0 2.60.6-2
has caused the Debian Bug report #933560,
regarding glib2.0 FTCBFS: dh_dwz fails, builds without -g, outdated debcrossgen
fork
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 [email protected]
immediately.)
--
933560: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=933560
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: glib2.0
Version: 2.60.6-1
Tags: patch
User: [email protected]
Usertags: ftcbfs
glib2.0 fails to cross build from source. The immediate reason is that
the toolchain dependency is not satisfiable. Since we don't have
toolchain dependency translation, we must revert that for now to cross
build it, but this is not the topic of this bug.
dh_dwz fails with a strange error. After some digging, it turns out that
this is the usual behaviour when debug symbols are missing. As it
happens, the build somehow lacked -g. It turns out that meson recently
changed its behaviour wrt. CFLAGS and no longer honours the environment
variable for cross builds. This regressed many packages and it was fixed
in debcrossgen. Now debcrossgen inserts CFLAGS into the cross file.
However glib2.0 uses a fork of debcrossgen and it wasn't updated yet.
The attached patch updates the debcrossgen fork from meson. Please
consider applying it.
Helmut
diff --minimal -Nru glib2.0-2.60.6/debian/changelog
glib2.0-2.60.6/debian/changelog
--- glib2.0-2.60.6/debian/changelog 2019-07-27 17:57:55.000000000 +0200
+++ glib2.0-2.60.6/debian/changelog 2019-07-31 16:42:54.000000000 +0200
@@ -1,3 +1,10 @@
+glib2.0 (2.60.6-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Sync debcrossgen from meson to handle CFLAGS. (Closes: #-1)
+
+ -- Helmut Grohne <[email protected]> Wed, 31 Jul 2019 16:42:54 +0200
+
glib2.0 (2.60.6-1) unstable; urgency=medium
* Team upload
diff --minimal -Nru glib2.0-2.60.6/debian/debcrossgen
glib2.0-2.60.6/debian/debcrossgen
--- glib2.0-2.60.6/debian/debcrossgen 2019-07-27 17:57:55.000000000 +0200
+++ glib2.0-2.60.6/debian/debcrossgen 2019-07-31 16:42:51.000000000 +0200
@@ -26,6 +26,9 @@
If you do not specify the --arch argument, Meson assumes that running
plain 'dpkg-architecture' will return correct information for the
host system.
+
+This script must be run in an environment where CPPFLAGS et al are set to the
+same values used in the actual compilation.
'''
)
@@ -47,6 +50,36 @@
return f
raise ValueError("%s not found on $PATH" % program)
+def write_args_line(ofile, name, args):
+ if len(args) == 0:
+ return
+ ostr = name + ' = ['
+ ostr += ', '.join("'" + i + "'" for i in args)
+ ostr += ']\n'
+ ofile.write(ostr)
+
+def write_args_from_envvars(ofile):
+ import shlex
+ cppflags = shlex.split(os.environ.get('CPPFLAGS', ''))
+ cflags = shlex.split(os.environ.get('CFLAGS', ''))
+ cxxflags = shlex.split(os.environ.get('CXXFLAGS', ''))
+ ldflags = shlex.split(os.environ.get('LDFLAGS', ''))
+
+ c_args = cppflags + cflags
+ cpp_args = cppflags + cxxflags
+ c_link_args = cflags + ldflags
+ cpp_link_args = cxxflags + ldflags
+
+ write_args_line(ofile, 'c_args', c_args)
+ write_args_line(ofile, 'cpp_args', cpp_args)
+ write_args_line(ofile, 'c_link_args', c_link_args)
+ write_args_line(ofile, 'cpp_link_args', cpp_link_args)
+
+cpu_family_map = dict(mips64el="mips64",
+ i686='x86')
+cpu_map = dict(armhf="arm7hlf",
+ mips64el="mips64",)
+
def run(options):
if options.arch is None:
cmd = ['dpkg-architecture']
@@ -62,8 +95,10 @@
data[k] = v
host_arch = data['DEB_HOST_GNU_TYPE']
host_os = data['DEB_HOST_ARCH_OS']
- host_cpu_family = data['DEB_HOST_GNU_CPU']
- host_cpu = data['DEB_HOST_ARCH'] # Not really correct, should be arm7hlf
etc but it is not exposed.
+ host_cpu_family = cpu_family_map.get(data['DEB_HOST_GNU_CPU'],
+ data['DEB_HOST_GNU_CPU'])
+ host_cpu = cpu_map.get(data['DEB_HOST_ARCH'],
+ data['DEB_HOST_ARCH'])
host_endian = data['DEB_HOST_ARCH_ENDIAN']
with open(options.outfile, "w") as ofile:
ofile.write('[binaries]\n')
@@ -80,6 +115,7 @@
except ValueError:
pass # pkg-config is optional
ofile.write('\n[properties]\n')
+ write_args_from_envvars(ofile)
for prop in options.set:
assert '=' in prop
key, value = prop.split('=', 1)
--- End Message ---
--- Begin Message ---
Source: glib2.0
Source-Version: 2.60.6-2
We believe that the bug you reported is fixed in the latest version of
glib2.0, 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 [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Simon McVittie <[email protected]> (supplier of updated glib2.0 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 [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Tue, 13 Aug 2019 10:32:40 +0100
Source: glib2.0
Architecture: source
Version: 2.60.6-2
Distribution: unstable
Urgency: medium
Maintainer: Debian GNOME Maintainers
<[email protected]>
Changed-By: Simon McVittie <[email protected]>
Closes: 933560
Changes:
glib2.0 (2.60.6-2) unstable; urgency=medium
.
* Team upload
* d/rules: Edit debcrossgen output instead of using a modified version.
This fixes use of CFLAGS, etc. during cross-compilation.
(Closes: #933560)
* Remove obsolete permissions fixing.
Issue 1539 was fixed upstream.
* d/p/debian/Disable-an-optimization-when-building-with-gcc-9.patch:
Disable an optimization when building with gcc-9, instead of forcing
gcc-8. This avoids depending on an old gcc, and should be easier to
deal with for cross-compilation. (Workaround for #931921)
* d/p/gmessages-Only-use-structured-logs-if-GLIB_VERSION_MAX_AL.patch:
Update to upstream glib-2-60 branch at commit 2.60.6-2-ga365528f6
- Don't use structured logging if GLIB_VERSION_MAX_ALLOWED < 2.56
Checksums-Sha1:
82c1676f0c9e2f83bec7ff3603e655f02b356e7c 3323 glib2.0_2.60.6-2.dsc
cad24fd7311120f1b05283dafa1171d395f563ea 86804 glib2.0_2.60.6-2.debian.tar.xz
874f14d52f2630c2d517cab7c6961c1a2ef94d69 8382 glib2.0_2.60.6-2_source.buildinfo
Checksums-Sha256:
05cce50af8f7a9a6a5095c5a50e531ee573da27246462187c1f70edeca6f6ef9 3323
glib2.0_2.60.6-2.dsc
fb56ed44d4ff9bc18685489c50305e58e182629f3a3d986e8f814f10155dab7c 86804
glib2.0_2.60.6-2.debian.tar.xz
8118ce804b9e229c216cb90d51a1c59444d2474e3af99fc4d316dd98c2fe5027 8382
glib2.0_2.60.6-2_source.buildinfo
Files:
14711fac3673d0fce968fab09acc38ba 3323 libs optional glib2.0_2.60.6-2.dsc
74b3b1567fb0f05e1a4ca2ed5e186313 86804 libs optional
glib2.0_2.60.6-2.debian.tar.xz
3a1d245c8d2f22fb68819fa7b7d9d8e5 8382 libs optional
glib2.0_2.60.6-2_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJEBAEBCAAuFiEENuxaZEik9e95vv6Y4FrhR4+BTE8FAl1SytQQHHNtY3ZAZGVi
aWFuLm9yZwAKCRDgWuFHj4FMT2hLD/9HkjxzX8AWXUxE1B96BscE7lzn15PX0KiW
bFmhRH8sq0yZo42Frpsw/9aSCjA3V0xKPM85LhhvIKV8IEPBQfMdYPHNwRNIkV/f
uxQu1zvxwkQ4C/R+dRl4ozEysRlPSCXZULgcuXtdphGpZaSYMsIOoKoY8ZF4lpMu
aPiq78q3JhFeA4U1gArBXcH5aTDq1D2DoNi4EeRXpY3+qgGe9xwOa3Zhdr5f1284
Ohi0hdhxqamkm1opJk3hieiPxylVUC4y9U0DxjIE1noed/43RqnCXVBQla1nYLlJ
o6CzTBEjf6MbY+68HoqJHJ5KCRg9Xnvhl8iWMMZvSd7S7jeUZdMUXzueCBClGCjF
bJrNE5U+bTkNit+/C6fM6EFocU/DnIAjN6aXz9fLcR2FMoiZTu0+oItvysE1sBBI
SV9YDPZbwtqKR9ciVVZ9yDP/zMwqNi1aV1gvrIHz0icChvuU3H7bGPQdmobZ1rEB
5PfCLgDN8k3fDcDNiXZAoCjmE3rj/f/VY/wOuK+ihpTBeyTvxYn+GE7TjYU8wOlf
uoo6sJb7+HjdzQaAc4J5Ym9xLyswnsrSv+HdHP92EYy5vGVttOv+Pc/U/PZ9HXAV
ft6o/27ICCkkB0ycjdeqY6WEm9qrs+6c5/N9Xa4MDzP/Xqm9HGS69vEX39wivnYF
sTtd/Q7lWg==
=A5bE
-----END PGP SIGNATURE-----
--- End Message ---
