Your message dated Wed, 11 Mar 2020 15:19:10 +0000
with message-id <[email protected]>
and subject line Bug#946369: fixed in gcr 3.36.0-1
has caused the Debian Bug report #946369,
regarding gcr: Please make autopkgtests cross-test-friendly
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.)


-- 
946369: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=946369
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: gcr
Version: 3.34.0-1
Severity: minor
Tags: patch
User: [email protected]
Usertags: origin-ubuntu focal ubuntu-patch

Dear maintainers,

In Ubuntu, we are in the process of moving the i386 architecture to a
compatibility-only layer on amd64, and therefore we are also moving our
autopkgtest infrastructure to test i386 binaries in a cross-environment.

This requires changes to some tests so that they are cross-aware and can do
the right thing.

The gcr tests currently fail in this environment, because they are build
tests that do not invoke the toolchain in a cross-aware manner.  I've
verified that the attached patch lets the tests successfully build (and run)
i386 tests on an amd64 host.

Note that upstream autopkgtest doesn't currently set DEB_HOST_ARCH so this
is a complete no-op in Debian for the moment.  Support for cross-testing in
autopkgtest is currently awaiting review at
https://salsa.debian.org/ci-team/autopkgtest/merge_requests/69 and once
landed, will still have no effect unless autopkgtest is invoked with a '-a'
option.  So this change should be safe to land in your package despite this
not being upstream in autopkgtest.

Thanks for considering,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                   https://www.debian.org/
[email protected]                                     [email protected]
diff -Nru gcr-3.34.0/debian/tests/libgck-1-dev 
gcr-3.34.0/debian/tests/libgck-1-dev
--- gcr-3.34.0/debian/tests/libgck-1-dev        2019-10-22 03:20:09.000000000 
-0700
+++ gcr-3.34.0/debian/tests/libgck-1-dev        2019-12-07 15:30:29.000000000 
-0800
@@ -11,6 +11,13 @@
 export XDG_RUNTIME_DIR="$WORKDIR"
 trap 'rm -rf "$WORKDIR"' 0 INT QUIT ABRT PIPE TERM
 cd "$WORKDIR"
+
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+    CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+    CROSS_COMPILE=
+fi
+
 cat <<EOF > test.c
 #include <gck/gck.h>
 
@@ -26,7 +33,7 @@
 
 # Deliberately word-splitting cflags and pkg-config's output:
 # shellcheck disable=SC2046 disable=SC2086
-gcc ${cflags} -o gck-test test.c $(pkg-config --cflags --libs gck-1)
+${CROSS_COMPILE}gcc ${cflags} -o gck-test test.c $(${CROSS_COMPILE}pkg-config 
--cflags --libs gck-1)
 echo "build: OK"
 [ -x gck-test ]
 ./gck-test
diff -Nru gcr-3.34.0/debian/tests/libgcr-3-dev 
gcr-3.34.0/debian/tests/libgcr-3-dev
--- gcr-3.34.0/debian/tests/libgcr-3-dev        2019-10-22 03:20:09.000000000 
-0700
+++ gcr-3.34.0/debian/tests/libgcr-3-dev        2019-12-07 15:30:29.000000000 
-0800
@@ -11,6 +11,13 @@
 export XDG_RUNTIME_DIR="$WORKDIR"
 trap 'rm -rf "$WORKDIR"' 0 INT QUIT ABRT PIPE TERM
 cd "$WORKDIR"
+
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+    CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+    CROSS_COMPILE=
+fi
+
 cat <<EOF > base.c
 #include <gcr/gcr.h>
 
@@ -37,21 +44,21 @@
 
 # Deliberately word-splitting cflags and pkg-config's output:
 # shellcheck disable=SC2046 disable=SC2086
-gcc ${cflags} -o gcr-test ui.c $(pkg-config --cflags --libs gcr-3)
+${CROSS_COMPILE}gcc ${cflags} -o gcr-test ui.c $(${CROSS_COMPILE}pkg-config 
--cflags --libs gcr-3)
 echo "build: OK"
 [ -x gcr-test ]
 xvfb-run -a dbus-run-session -- ./gcr-test
 echo "run: OK"
 
 # shellcheck disable=SC2046 disable=SC2086
-gcc ${cflags} -o base-test base.c $(pkg-config --cflags --libs gcr-ui-3)
+${CROSS_COMPILE}gcc ${cflags} -o base-test base.c $(${CROSS_COMPILE}pkg-config 
--cflags --libs gcr-ui-3)
 echo "build: OK"
 [ -x base-test ]
 ./base-test
 echo "run: OK"
 
 # shellcheck disable=SC2046 disable=SC2086
-gcc ${cflags} -o ui-test ui.c $(pkg-config --cflags --libs gcr-ui-3)
+${CROSS_COMPILE}gcc ${cflags} -o ui-test ui.c $(${CROSS_COMPILE}pkg-config 
--cflags --libs gcr-ui-3)
 echo "build: OK"
 [ -x ui-test ]
 xvfb-run -a dbus-run-session -- ./ui-test

--- End Message ---
--- Begin Message ---
Source: gcr
Source-Version: 3.36.0-1
Done: Laurent Bigonville <[email protected]>

We believe that the bug you reported is fixed in the latest version of
gcr, 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.
Laurent Bigonville <[email protected]> (supplier of updated gcr 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: Wed, 11 Mar 2020 15:52:58 +0100
Source: gcr
Architecture: source
Version: 3.36.0-1
Distribution: unstable
Urgency: medium
Maintainer: Debian GNOME Maintainers 
<[email protected]>
Changed-By: Laurent Bigonville <[email protected]>
Closes: 946369
Changes:
 gcr (3.36.0-1) unstable; urgency=medium
 .
   * New upstream release
     - Bump build-dependencies and switch to meson
     - Drop d/p/build-Use-sed-for-.desktop-variables-substitution.patch, not
       needed now that we switched to meson
     - debian/libgcr-base-3-1.symbols: Add newly exported symbols
   * Move gcr-prompter and gcr-ssh-askpass to /usr/libexec
   * debian/control.in: Mark the -doc packages as Build-Profiles: <!nodoc> and
     add libgtk-3-doc to the BDI
   * debian/control.in: Bump Standards-Version to 4.5.0 (no further changes)
   * Make autopkgtests cross-test-friendly, thanks to Steve Langasek (Closes:
     #946369)
Checksums-Sha1:
 6fac1d2d1ca516754333dc2e770bdbfa344758b3 2727 gcr_3.36.0-1.dsc
 66b9d32238e7ed149534806aad9fe7e1633f44fa 1025760 gcr_3.36.0.orig.tar.xz
 5a83678847ce5fab09980caa6a68ca7d9ec8c7d1 22068 gcr_3.36.0-1.debian.tar.xz
 4f489dd92574b05ff64e65d09b7f98bde3f85d42 14775 gcr_3.36.0-1_source.buildinfo
Checksums-Sha256:
 32fc8f8ccb83d7b4a422e275a5010f6006d7d8cebabe0f01d8de35cba452e993 2727 
gcr_3.36.0-1.dsc
 aaf9bed017a2263c6145c89a1a84178f9f40f238426463e4ae486694ef5f6601 1025760 
gcr_3.36.0.orig.tar.xz
 1793d65bb6a1370ebccfeeec9997ba8ad6ab7819a6da7cfd7d25d67676f0ea24 22068 
gcr_3.36.0-1.debian.tar.xz
 459f64ff3e69adb8aada36047f2fd084cdeaa3348eec8aace9f2b2f488d13d18 14775 
gcr_3.36.0-1_source.buildinfo
Files:
 92693111c6f9474ce60a13c8440f7049 2727 gnome optional gcr_3.36.0-1.dsc
 adc65563b6b458507b9a578a8b68fb61 1025760 gnome optional gcr_3.36.0.orig.tar.xz
 06296cae364720cdee195d126de46ba8 22068 gnome optional 
gcr_3.36.0-1.debian.tar.xz
 74a87cab543f98b1dec7d9a52b1f115d 14775 gnome optional 
gcr_3.36.0-1_source.buildinfo

-----BEGIN PGP SIGNATURE-----

iQFFBAEBCAAvFiEEmRrdqQAhuF2x31DwH8WJHrqwQ9UFAl5o+2MRHGJpZ29uQGRl
Ymlhbi5vcmcACgkQH8WJHrqwQ9W4pQgAk8i3P0Lapwgj/g1uMkcIro2QAG7lExSb
W/vAb35sgW4FTAydVKKRaKhmlusZ3ot9SJx1El24yRA2d0ocEQHr+/yAV2NQhvfD
NzC9bxEMxQ9EdT8LLG0wknfkkO8ZEAhiWK0hL/l8/CudN0lJCSOBLnc6J6JPaDcf
wDVzG9kWtxhpQLG906bt9pxMNQAHhyt5+T/TLNKy5d8LSTWABC5pSez2fH6d3c5u
50DOQV2VvA1ikgdN1kfoC6zOTjVhh71oWMkkmUvrTVuAPX/RuyGE8A109IpJ9hCQ
zpYlhhbQEF7828qMnQC97CxHZgoUVjDGR8yitFCwT/t53Xjy72Yhyw==
=eKAQ
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to