Your message dated Mon, 12 Aug 2019 12:19:32 +0000
with message-id <[email protected]>
and subject line Bug#933560: fixed in glib2.0 2.61.2-1
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.61.2-1
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: Mon, 12 Aug 2019 09:32:26 +0100
Source: glib2.0
Architecture: source
Version: 2.61.2-1
Distribution: experimental
Urgency: medium
Maintainer: Debian GNOME Maintainers
<[email protected]>
Changed-By: Simon McVittie <[email protected]>
Closes: 933560
Changes:
glib2.0 (2.61.2-1) experimental; urgency=medium
.
* Team upload
* New upstream release
* d/patches: Update to upstream git master, commit 2.61.2-23-g870b30bd7
- Fix regression in g_mkdir_with_permissions()
- Fix a memory leak
- Update translations: es, id, ro
* Merge changes from unstable
* Refresh patch series
* d/p/debian/06_thread_test_ignore_prctl_fail.patch:
Use g_test_skip() when skipping test
* d/p/GIO-tests-Don-t-do-clever-tricks-with-objcopy.patch:
Drop workaround for #932287, and build-depend on fixed binutils on
mips64el instead
* d/rules: Edit debcrossgen output instead of using a modified version.
This fixes use of CFLAGS, etc. during cross-compilation.
(Closes: #933560)
* d/libglib2.0-0.symbols: Update
* Remove obsolete permissions fixing.
Issue 1539 was fixed upstream.
* libglib2.0-tests: Depend on libglib2.0-dev-bin.
This is required for the new mkenums and genmarshal tests.
* 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)
Checksums-Sha1:
8e5145f369ebe3cda3d5eba261a1c82ce78426ca 3374 glib2.0_2.61.2-1.dsc
7643c5128633410b6a9a6137e449966bc74093b1 4664892 glib2.0_2.61.2.orig.tar.xz
7d7fd22ed619f3f963562789442e9227887dd3b7 120636 glib2.0_2.61.2-1.debian.tar.xz
2fe1a7f352658375f1116de87b5dc81197ad4285 8382 glib2.0_2.61.2-1_source.buildinfo
Checksums-Sha256:
444cc64a3b07f0e7704b803c20f980e4bef74d2ea2b297c26982a07fb70f9641 3374
glib2.0_2.61.2-1.dsc
99c6bcfb8600562d519222a429e2dc0af469b2006b8080a9a1f438456071c0b5 4664892
glib2.0_2.61.2.orig.tar.xz
5603a0fa69febd496e6f9e45d0c2c71539a806c0c3bd30ce78128dd22c4756d2 120636
glib2.0_2.61.2-1.debian.tar.xz
9849b36f70bec3405358fbb16af932bd7c695553727b028410dceb17a9a9e8fa 8382
glib2.0_2.61.2-1_source.buildinfo
Files:
b163bdc704c32c6dedaa6ab13ed47fd3 3374 libs optional glib2.0_2.61.2-1.dsc
9793a7f404fbf6d82c5aef1f47eaafc0 4664892 libs optional
glib2.0_2.61.2.orig.tar.xz
973f95c131568345424f6ef59ae518b8 120636 libs optional
glib2.0_2.61.2-1.debian.tar.xz
6d652b599b00a298d1c3050aee12c5c1 8382 libs optional
glib2.0_2.61.2-1_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJEBAEBCAAuFiEENuxaZEik9e95vv6Y4FrhR4+BTE8FAl1RViEQHHNtY3ZAZGVi
aWFuLm9yZwAKCRDgWuFHj4FMT+URD/94QA3EWLV1Wp4a4KTReNJRS4tJlgtPz9Tw
2p3x0XXlUtfYeXAmy3X1Qe6G7N8Ot2w5Hmq21wB3sgmWOYydtrakRex5rX/+SqhB
naN2PpoPCDBWsILk0AX+Vc2UbSfgSF5NpXmWbGn2lf0yEwR+MIcXgFlBqljuBvei
A5Ikq1OKDqFn9fftI4+794MA1dpLAdaS3Gi9yyflknoeE2gUZu2UcfUxJv7PrxIM
vcSmDkjKL9JMUQfv+3vxmUYhIObdX/ZWFm/QURhaUSJUlsZfLbzA47GzOC5xbGPY
NT8uC9I7p6liPSOVQT8Ehg8uy9+bqdQHANHs5wh2285Zp1vMDD1SAmTSxOOOxk+t
k08ZTDkiJSDYL7XWwar+1mD8xe2rYwhYSEq30+lwKhW9H0CwU//di4hihPhpj4yc
DuH/2NSg2te5VzD+BLrEZgbo9gDISBT8PtR2q55FVokIpkAjxuK6X5gcxyH/ZejS
kMHwZB6uU7ApWJvn7kfpCEsgxeEPg55/oS0iDJULjpOaZg4i2wyWCoYSlwOjhMMW
1Rwz8uxfvPzCTl1w2aX7N2vkVCV2p1umCnR5ESt1g7bBLGQpCd9adadRfSjLWzky
X3ERP97r6fLsc8kAI+0W3Le4UXfzaV4zFVmV8Xe+7QWTpLvAGNVZkmmQr3jGbS5f
49LHl7tcqw==
=2S4r
-----END PGP SIGNATURE-----
--- End Message ---
