Your message dated Thu, 12 Sep 2019 20:37:52 +0000
with message-id <[email protected]>
and subject line Bug#939518: fixed in dpuser 4.0+dfsg-2
has caused the Debian Bug report #939518,
regarding dpuser FTCBFS: does not pass cross tools to make
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.)
--
939518: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=939518
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: dpuser
Version: 4.0+dfsg-1
Tags: patch
User: [email protected]
Usertags: ftcbfs
dpuser fails to cross build from source, because it does not pass cross
tools to make. For the dpuser subdirectory, the easiest way of mostly
fixing this is using dh_auto_build. There are two places where g++ is
hard coded rather than using $(CXX), which also need to be fixed. The
attached patch fixes these issues.
Then it comes to the QFitsView. There a makefile calls qmake without the
appropriate flags. This is more difficult. Usually, we try to call qmake
through dh_auto_configure, but the qmake call is wrapped here
unfortunately. I don't have a simple solution here.
Please consider applying the attached patch anyway as an incremental
step and close this bug when doing so.
Helmut
diff --minimal -Nru dpuser-4.0+dfsg/debian/changelog
dpuser-4.0+dfsg/debian/changelog
--- dpuser-4.0+dfsg/debian/changelog 2019-09-04 20:56:42.000000000 +0200
+++ dpuser-4.0+dfsg/debian/changelog 2019-09-05 21:54:55.000000000 +0200
@@ -1,3 +1,10 @@
+dpuser (4.0+dfsg-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Improve cross building: Build dpuser with the right compiler. (Closes: #-1)
+
+ -- Helmut Grohne <[email protected]> Thu, 05 Sep 2019 21:54:55 +0200
+
dpuser (4.0+dfsg-1) unstable; urgency=low
* Update VCS fields to use salsa.d.o
diff --minimal -Nru dpuser-4.0+dfsg/debian/patches/cross.patch
dpuser-4.0+dfsg/debian/patches/cross.patch
--- dpuser-4.0+dfsg/debian/patches/cross.patch 1970-01-01 01:00:00.000000000
+0100
+++ dpuser-4.0+dfsg/debian/patches/cross.patch 2019-09-05 21:54:55.000000000
+0200
@@ -0,0 +1,20 @@
+--- dpuser-4.0+dfsg.orig/dpuser/Makefile
++++ dpuser-4.0+dfsg/dpuser/Makefile
+@@ -31,7 +31,7 @@
+ SED = sed
+ CC = gcc
+ CXX = g++
+-LINK = g++
++LINK = $(CXX)
+ QF =
+ GDL =
+ PY =
+@@ -262,7 +262,7 @@
+ endif # end LINUX & MACOSX
+
+ $(TARGET_DLL): $(DLL_OBJECTS)
+- g++ -shared -o $(TARGET_DLL) $(DLL_OBJECTS) $(DLL_LIBS)
++ $(LINK) -shared -o $(TARGET_DLL) $(DLL_OBJECTS) $(DLL_LIBS)
+
+ $(TARGET_WIN): $(OBJECTS)
+ $(LINK) $(LDFLAG) -o $(TARGET_WIN) $(OBJECTS) $(LIBS)
diff --minimal -Nru dpuser-4.0+dfsg/debian/patches/series
dpuser-4.0+dfsg/debian/patches/series
--- dpuser-4.0+dfsg/debian/patches/series 2019-09-04 20:56:42.000000000
+0200
+++ dpuser-4.0+dfsg/debian/patches/series 2019-09-05 21:54:55.000000000
+0200
@@ -8,3 +8,4 @@
Don-t-use-SVN-version.patch
Fix-gcc-optimization-bug-in-ifNode-evaluate.patch
Fix-test-script.patch
+cross.patch
diff --minimal -Nru dpuser-4.0+dfsg/debian/rules dpuser-4.0+dfsg/debian/rules
--- dpuser-4.0+dfsg/debian/rules 2019-09-04 20:56:42.000000000 +0200
+++ dpuser-4.0+dfsg/debian/rules 2019-09-05 21:54:55.000000000 +0200
@@ -9,7 +9,7 @@
dh $@
override_dh_auto_build:
- $(MAKE) -C dpuser
+ dh_auto_build --sourcedirectory=dpuser --no-parallel
$(MAKE) -C QFitsView release_shared
ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
--- End Message ---
--- Begin Message ---
Source: dpuser
Source-Version: 4.0+dfsg-2
We believe that the bug you reported is fixed in the latest version of
dpuser, 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.
Ole Streicher <[email protected]> (supplier of updated dpuser 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: SHA512
Format: 1.8
Date: Thu, 12 Sep 2019 21:24:15 +0200
Source: dpuser
Architecture: source
Version: 4.0+dfsg-2
Distribution: unstable
Urgency: low
Maintainer: Debian Astro Team <[email protected]>
Changed-By: Ole Streicher <[email protected]>
Closes: 939518
Changes:
dpuser (4.0+dfsg-2) unstable; urgency=low
.
[ Helmut Grohne ]
* Improve cross building: Build dpuser with the right compiler.
(Closes: #939518)
.
[ Ole Streicher ]
* Propagate CPPFLAGS for dpuser build
* Build doc only for -all architecture
* Wrap inclusion of .xpm files with 'extern "C"'
* Remove VTK references in patches
* Add icon for QFitsView
* Make dpuser-doc Multi-Arch:foreign
Checksums-Sha1:
2e25414cb62690e3eee6badb281ee613b2ced135 2281 dpuser_4.0+dfsg-2.dsc
d5c8bd1c49e51a7cd967b3ed26316b1131ec6feb 13972 dpuser_4.0+dfsg-2.debian.tar.xz
Checksums-Sha256:
616ba4e385996e09762e7b323d6d5fcd69c27a25e84a39363cb3bd0de98d3ac5 2281
dpuser_4.0+dfsg-2.dsc
bed4b8aca528f8fe81eb136f2ec8baf72580d83a4fea50e894094b8661e7562f 13972
dpuser_4.0+dfsg-2.debian.tar.xz
Files:
ec491000cbef7bddc53f1eef19917128 2281 science optional dpuser_4.0+dfsg-2.dsc
1d1d1b0d3716993222d896447741a6d3 13972 science optional
dpuser_4.0+dfsg-2.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEE7/BpV0Ra2/h0L3qtmk9WvbkOGL0FAl16oRAACgkQmk9WvbkO
GL0aHw/+Ohw0R2ze2+V4bhXS8tbbu/fxzWKtEHj9grGzDQX8qdKJTRA6B5n9+MmU
Wj8rNHtoIBy+x5DiQ0WxdMViHfP2kx7heaNvnc9B2VH4gLR20SKSMweb2gJX+TJW
eb2YOnx8xXKJhjj0cSf+8s+2wKA5qwnG8KyRVl7DH3qftoTpwZ4dw0vXZ5ogRFqo
lO10rD70kqUg0pNYCMseMl/KL/AhiyaFYo1bSC8mN0a2qBSmXcZKnVtgL7H9kG0E
muoI2L3up7GJP8EeaB6vUYMzNM7eVNiJ9T63biAcMF32AKil1IHui9x9gOwkxd1O
EpNlRLccu7U2XoEI5slwf/2KNIOQVSF2JTtKLUuQdyP0PLbNVHIe7alB582E00Xq
1WwDrEb094lhujKSnIkmpvT0haNmzeVffB/MavRFTJ9PZ/Szx1Gh4W3vymhqe5t4
s2y+3pB1doeeXY4SifYfz7akVt51KEL0vYqnFXk/grSJicGnmT1v4JlU1Bx2njhZ
d8uTOSIPJJ21Pd7DELoybZIk9giwuPRrHql6NJsr7iFCg/R2i+T3CxpNDbnSQNB0
wRdQyk50x4XTQ8gswh9cA1di/ZxpBar7z4ZHg0IOI4KkhEszzbcMMHWjihqIFakz
8CQ297eemSiQ+ozZrXEap4HLoXlRpN6f0WVoi9CDmA9zkhr8yEk=
=uVlk
-----END PGP SIGNATURE-----
--- End Message ---
