Your message dated Thu, 10 Aug 2017 12:35:00 +0000
with message-id <e1dfmg0-0002vz...@fasolo.debian.org>
and subject line Bug#871635: fixed in xpa 2.1.18-3
has caused the Debian Bug report #871635,
regarding xpa FTCBFS: fails running tests despite DEB_BUILD_OPTIONS=nocheck
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.)


-- 
871635: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=871635
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: xpa
Version: 2.1.18-2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

Hi Ole,

thank you for quickly fixing #871509. That made working on the package
much more joyful. It currently fails to cross build, because it
unconditionally runs the test suite and (expectedly) fails doing so
during cross compilation. After adding the relevant guards to the
override, the build continues and fails in ./mklib. It uses the wrong
compiler and passes flags not understood by cross compilers. I've come
up with a partially upstreamable patch. After applying it, xpa cross
builds successfully. Can you apply it?

Helmut
diff --minimal -Nru xpa-2.1.18/debian/changelog xpa-2.1.18/debian/changelog
--- xpa-2.1.18/debian/changelog 2017-08-09 13:32:17.000000000 +0200
+++ xpa-2.1.18/debian/changelog 2017-08-10 09:43:42.000000000 +0200
@@ -1,3 +1,12 @@
+xpa (2.1.18-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
+    + Support DEB_BUILD_OPTIONS=nocheck.
+    + cross.patch: Make ./mklib work with cross compilers.
+
+ -- Helmut Grohne <hel...@subdivi.de>  Thu, 10 Aug 2017 09:43:42 +0200
+
 xpa (2.1.18-2) unstable; urgency=medium
 
   * Recognise the exit status of mklibs (Closes: #871509)
diff --minimal -Nru xpa-2.1.18/debian/patches/cross.patch 
xpa-2.1.18/debian/patches/cross.patch
--- xpa-2.1.18/debian/patches/cross.patch       1970-01-01 01:00:00.000000000 
+0100
+++ xpa-2.1.18/debian/patches/cross.patch       2017-08-10 09:43:42.000000000 
+0200
@@ -0,0 +1,74 @@
+From: Helmut Grohne <hel...@subdivi.de>
+Subject: make mklib work with cross compilation
+
+The first hunk makes it use the compiler discovered by ./configure and thus
+will work with cross compilers. Since Makefile.in exports CC and CXX, it seems
+like mklib should be picking these up and not doing so is an upstream bug.
+
+Then remove insertion of -m32, because this is not universally understood by
+cross compilers. On Debian, the provided compiler will always choose the
+correct ABI, so no -m32 or -m64 is necessary. This part likely is not
+upstreamable.
+
+Index: xpa-2.1.18/mklib
+===================================================================
+--- xpa-2.1.18.orig/mklib
++++ xpa-2.1.18/mklib
+@@ -211,9 +211,9 @@
+       if [ "x$LINK" = "x" ] ; then
+           # -linker was not specified so set default link command now
+             if [ $CPLUSPLUS = 1 ] ; then
+-                LINK=g++
++                LINK=${CXX:-g++}
+             else
+-                LINK=gcc
++                LINK=${CC:-gcc}
+             fi
+       fi
+ 
+@@ -228,14 +228,6 @@
+           ;;
+           esac
+ 
+-          # Check if objects are 32-bit and we're running in 64-bit
+-          # environment.  If so, pass -m32 flag to linker.
+-          set ${OBJECTS}
+-          ABI32=`file $1 | grep 32-bit`
+-          if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
+-              OPTS="-m32 ${OPTS}"
+-          fi
+-
+             if [ "${ALTOPTS}" ] ; then
+                 OPTS=${ALTOPTS}
+             fi
+@@ -281,13 +273,6 @@
+               # exptmp is removed below
+           fi
+ 
+-          # Check if objects are 32-bit and we're running in 64-bit
+-          # environment.  If so, pass -m32 flag to linker.
+-          set ${OBJECTS}
+-          ABI32=`file $1 | grep 32-bit`
+-          if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
+-              OPTS="-m32 ${OPTS}"
+-          fi
+             if [ "${ALTOPTS}" ] ; then
+                 OPTS=${ALTOPTS}
+             fi
+@@ -355,15 +340,7 @@
+               OPTS="-G"
+           else
+               # gcc linker
+-              # Check if objects are 32-bit and we're running in 64-bit
+-              # environment.  If so, pass -m32 flag to linker.
+-              set ${OBJECTS}
+-              ABI32=`file $1 | grep 32-bit`
+-              if [ "${ABI32}" ] ; then
+-                  OPTS="-m32 -shared -Wl,-Bdynamic"
+-              else
+-                  OPTS="-m64 -shared -Wl,-Bdynamic"
+-              fi
++              OPTS="-shared -Wl,-Bdynamic"
+           fi
+ 
+           # Check if objects are SPARC v9
diff --minimal -Nru xpa-2.1.18/debian/patches/series 
xpa-2.1.18/debian/patches/series
--- xpa-2.1.18/debian/patches/series    2017-08-09 13:30:54.000000000 +0200
+++ xpa-2.1.18/debian/patches/series    2017-08-10 09:43:42.000000000 +0200
@@ -5,3 +5,4 @@
 Add-hardening-flags.patch
 Sort-.o-files.patch
 Recognise-the-exit-status-of-mklibs.patch
+cross.patch
diff --minimal -Nru xpa-2.1.18/debian/rules xpa-2.1.18/debian/rules
--- xpa-2.1.18/debian/rules     2017-02-03 17:14:31.000000000 +0100
+++ xpa-2.1.18/debian/rules     2017-08-10 09:43:42.000000000 +0200
@@ -12,8 +12,10 @@
 override_dh_auto_build:
        dh_auto_build -- All tclxpa
 
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 override_dh_auto_test:
        debian/tests/xpa_test_build
+endif
 
 override_dh_installchangelogs:
        dh_installchangelogs doc/changelog.html

--- End Message ---
--- Begin Message ---
Source: xpa
Source-Version: 2.1.18-3

We believe that the bug you reported is fixed in the latest version of
xpa, 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 871...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Ole Streicher <oleb...@debian.org> (supplier of updated xpa 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: Thu, 10 Aug 2017 14:04:00 +0200
Source: xpa
Binary: libxpa1 libxpa-dev xpa-tools tcl-xpa
Architecture: source
Version: 2.1.18-3
Distribution: unstable
Urgency: medium
Maintainer: Debian Astro Team <debian-astro-maintain...@lists.alioth.debian.org>
Changed-By: Ole Streicher <oleb...@debian.org>
Description:
 libxpa-dev - Seamless communication between Unix programs (development files)
 libxpa1    - Seamless communication between Unix programs (shared library)
 tcl-xpa    - Seamless communication between Unix programs (Tcl interface)
 xpa-tools  - Tools for seamless communication between Unix programs
Closes: 871635
Changes:
 xpa (2.1.18-3) unstable; urgency=medium
 .
   [ Helmut Grohne ]
   * Support DEB_BUILD_OPTIONS=nocheck. Closes: #871635
   * make mklib work with cross compilation
Checksums-Sha1:
 833d7ec930c69dcb73b0ef29ea8cea7938029bc8 2173 xpa_2.1.18-3.dsc
 89a00ef58e585e5f586040d803a52a8146d1ed79 11648 xpa_2.1.18-3.debian.tar.xz
Checksums-Sha256:
 12fe3ee7faab35a05f43f246159606f0856d2da9f475928a8cbeabebcbdd9d35 2173 
xpa_2.1.18-3.dsc
 f259a1a1546b3b1aaebf476eacf6a7ad7caa0d72ba02d706734a75d2dd0aa93e 11648 
xpa_2.1.18-3.debian.tar.xz
Files:
 0631b818c56c5621564513b03ba8d30a 2173 science optional xpa_2.1.18-3.dsc
 fb0e131210574186f2d3101a601505de 11648 science optional 
xpa_2.1.18-3.debian.tar.xz

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

iQIzBAEBCAAdFiEEuvxshffLFD/utvsVcRWv0HcQ3PcFAlmMTakACgkQcRWv0HcQ
3PeD2w//e/PRP6XGr1ajYHM8U3bRMNmRYdJooilwgDRQTN1e5hpRPaAXAPt/d2+n
jTc7jRjN1Ljiu6ppb1Jgii3rul25NAqTHQdOMvMbhACsz7ZppwD0GH5q72q9xa5G
x0SymUQoUojXC2/9zg6jw+Kjj8pPGCL4vd+ok5V2xZwh8tdZWBcTwT3H8LHGnpy5
6C6sy8nnrRe8Ixr+/3poP5LbDZnBod/1GHy3tvtTBAREAWLsKmMbJSPPzUKWM/I1
Oldj74mI8inZNcc71kYd7xrhLZtQUhzrSEp+2oIJHUI2SUd81e5l5hVMvPcn3zdj
NpSKMuUPiq69Ta0Lxo39dia7VRYi1NDVPLG7iRG44EP5k2HevkXqNjU+N1yw7j/A
KbdAoztcP4YqVumZ4WS3KARLiUtAMoU6s1f50rS4OHE42ed7fnSIIb/lafsebjdf
VgipxTE9GMjt9o6q5Fm4kTGPbDTcLcCw/4eHv6T2LzBRaMnAJy4ER8w10L7q5o40
rv4KDldOtXFa2MTSyJw7FKoRRTss13FmGgAI8waim2QRurbNkWY7CeNZBpQ6oO+u
HrF/kvS66Ux4NAV6xArvv8SZa+qIpxCqzguVSt6Gqx3pD13JNE31CLbY1y3T+Y0G
hEBwaUvtmIn+oK6wZnQaUww4jfchwtrgLPpw6nocjYpzEqnW72A=
=fEga
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to