[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#911250: marked as done (morse FTCBFS: builds for the wrong architecture)

Your message dated Wed, 05 Jan 2022 13:04:20 +0000
with message-id <E1n55xk-0007AH-BZ@fasolo.debian.org>
and subject line Bug#911250: fixed in morse 2.5-2
has caused the Debian Bug report #911250,
regarding morse FTCBFS: builds for the wrong architecture
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 owner@bugs.debian.org
immediately.)


-- 
911250: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911250
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Source: morse
Version: 2.5-1
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap

morse fails to cross build from source, because it does not pass any
cross tools to make. The easiest way of fixing that is using
dh_auto_build. The morse.d directory still hard codes the build
architecture pkg-config. After making it substitutable, morse cross
builds successfully. Please consider applying the attached patch.

Helmut

diff --minimal -Nru morse-2.5/debian/changelog morse-2.5/debian/changelog
--- morse-2.5/debian/changelog	2015-06-10 21:40:20.000000000 +0200
+++ morse-2.5/debian/changelog	2018-10-17 19:16:30.000000000 +0200
@@ -1,3 +1,12 @@
+morse (2.5-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
+    + Let dh_auto_build supply cross tools to make.
+    + cross.patch: Make pkg-config substitutable.
+
+ -- Helmut Grohne <helmut@subdivi.de>  Wed, 17 Oct 2018 19:16:30 +0200
+
 morse (2.5-1) unstable; urgency=low
 
   * New upstream release.
diff --minimal -Nru morse-2.5/debian/patches/cross.patch morse-2.5/debian/patches/cross.patch
--- morse-2.5/debian/patches/cross.patch	1970-01-01 01:00:00.000000000 +0100
+++ morse-2.5/debian/patches/cross.patch	2018-10-17 19:16:30.000000000 +0200
@@ -0,0 +1,25 @@
+--- morse-2.5.orig/morse.d/Makefile
++++ morse-2.5/morse.d/Makefile
+@@ -3,16 +3,18 @@
+ BEEPERS = beepLinux.c beepOSS.c beepX11.c beepALSA.c
+ SOURCES = alarm.c morse.c alarm.h beep.h $(BEEPERS)
+ 
++PKG_CONFIG ?= pkg-config
++
+ # The flags necessary to link with the X11 libraries.
+ X11LIBS = -L/usr/X11R6/lib -lX11
+ 
+ # The flags necessary to link with PulseAudio and support pthread
+-PA_CFLAGS = -pthread $(shell pkg-config --cflags libpulse-simple)
+-PA_LIBS = $(shell pkg-config --libs libpulse-simple) -pthread
++PA_CFLAGS = -pthread $(shell $(PKG_CONFIG) --cflags libpulse-simple)
++PA_LIBS = $(shell $(PKG_CONFIG) --libs libpulse-simple) -pthread
+ 
+ # The flags necessary to link with ALSA
+-ALSA_CFLAGS = $(shell pkg-config --cflags alsa)
+-ALSA_LIBS = $(shell pkg-config --libs alsa)
++ALSA_CFLAGS = $(shell $(PKG_CONFIG) --cflags alsa)
++ALSA_LIBS = $(shell $(PKG_CONFIG) --libs alsa)
+ 
+ # Any additional flags your favorite C compiler requires to work.
+ CFLAGS  = -O3 -I/usr/X11R6/include $($(device)_EXTRA_CFLAGS)
diff --minimal -Nru morse-2.5/debian/patches/series morse-2.5/debian/patches/series
--- morse-2.5/debian/patches/series	2015-06-10 21:38:46.000000000 +0200
+++ morse-2.5/debian/patches/series	2018-10-17 19:16:30.000000000 +0200
@@ -4,3 +4,4 @@
 04fix-pa_simple_write-with-mono-output.patch
 05fix_ftbfs.patch
 06fix_-X_handling.patch
+cross.patch
diff --minimal -Nru morse-2.5/debian/rules morse-2.5/debian/rules
--- morse-2.5/debian/rules	2015-06-10 21:38:46.000000000 +0200
+++ morse-2.5/debian/rules	2018-10-17 19:16:27.000000000 +0200
@@ -37,15 +37,15 @@
 	dh_testdir
 
 	# Add here commands to compile the package.
-	cd qso.d && $(MAKE)
-	cd morse.d && $(MAKE) DEVICE=X11
-	cd morse.d && $(MAKE) DEVICE=PA
-	cd morse.d && $(MAKE) DEVICE=OSS
+	dh_auto_build --sourcedirectory=qso.d
+	dh_auto_build --sourcedirectory=morse.d -- DEVICE=X11
+	dh_auto_build --sourcedirectory=morse.d -- DEVICE=PA
+	dh_auto_build --sourcedirectory=morse.d -- DEVICE=OSS
 	if dpkg-architecture -ilinux-any ; then \
-		cd morse.d && $(MAKE) DEVICE=Linux ; \
+		dh_auto_build --sourcedirectory=morse.d -- DEVICE=Linux ; \
 	fi
 	if dpkg-architecture -ilinux-any ; then \
-		cd morse.d && $(MAKE) DEVICE=ALSA ; \
+		dh_auto_build --sourcedirectory=morse.d -- DEVICE=ALSA ; \
 	fi
 	#docbook-to-man debian/morse.sgml > morse.1
 	xmlto man morse.xml

--- End Message ---
--- Begin Message --- 
Source: morse
Source-Version: 2.5-2
Done: Christoph Berg <myon@debian.org>

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

Debian distribution maintenance software
pp.
Christoph Berg <myon@debian.org> (supplier of updated morse 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 ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Wed, 05 Jan 2022 13:11:40 +0100
Source: morse
Architecture: source
Version: 2.5-2
Distribution: unstable
Urgency: medium
Maintainer: Debian Hamradio Maintainers <debian-hams@lists.debian.org>
Changed-By: Christoph Berg <myon@debian.org>
Closes: 911250
Changes:
 morse (2.5-2) unstable; urgency=medium
 .
   * Team upload.
 .
   [ Christoph Berg ]
   * DH 13.
   * Simplify rules using dh.
   * Add gitlab-ci.yml.
 .
   [ Helmut Grohne ]
   * Fix FTCBFS: (Closes: #911250)
     + Let dh_auto_build supply cross tools to make.
     + cross.patch: Make pkg-config substitutable.
Checksums-Sha1:
 e6b7b52745a5936e422bfaf847169f12557ea918 2000 morse_2.5-2.dsc
 3f7234221e5423d85d8371d30b72bff68c4adc07 6200 morse_2.5-2.debian.tar.xz
Checksums-Sha256:
 5c566d77e04873e671479c14b1468e6900c4b0655fb04af5fea14fb3c963a717 2000 morse_2.5-2.dsc
 c3838ca9d6a74dba514df75c588cd3dee4548efa81ac52c30d8464bed9dd5a1a 6200 morse_2.5-2.debian.tar.xz
Files:
 e0920dc321084d33cea6ce25a1caa7b7 2000 hamradio optional morse_2.5-2.dsc
 f8ed7502a1c4d9f30a8b12da12875d34 6200 hamradio optional morse_2.5-2.debian.tar.xz

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

iQIzBAEBCAAdFiEEXEj+YVf0kXlZcIfGTFprqxLSp64FAmHVlrEACgkQTFprqxLS
p64dtA//f9w1Q9g//2rDJspX/0ZNACcnedVzn/p5eOtJeGarKWzZVxCcH/SCrtcd
1SQBVyYecCAv7WwJSVj8bBa9C5cOXwEGXBsoCqi2HRRS/bWfSZWB0EIbWPWNLztc
NFvH7nwm8Dmyw2agJfpYF1S3Ym7+K9rrfCxYtprrOf09aIed/eueymg011YchmkH
xGz1ViBT/h2wJICezrEX/c9uQeLX7nLlw7ZAY11y4TqK4MtGtLHRbVe5nqoLqfci
f/G00blKxqUTFAgovY/QNZgrRJ06If/3y8+jv0x9Bfv1TonpzRtzmhiVSg/L47nZ
nByxWiW+4at4Qv35NzPCxXexFfZJk1RGnbTGYLxz8QTPQnGJCdU2ZbGQZg7Hr0OM
y2EkQYk6elgh8jTmRVzfUErIC3elkZ2KxWGjkDIyh+8K4mbs3NTUVskfwJw3V6Pl
xQ5dDjHnomOQtrlC9rvJmRRum5fKt+/AnOxf4fv2ntBqPB5iK+3r2e1fr1xCvuCy
RYQKIlqJoi8CXI3Lp2narvV4f8D+laR9ksPOWFN97ABqY8Dn2n6bTmlgfDGWEaNr
Z5it6GttCOzWHHsE9VRfMQINbbF0u1ESOIIGxua36WiZWjDMGKdkAlLjnllN8ZQG
B3+JRUzxB9gFxOG8+CSLnne4M7OGcIApYX7V8NW3CFykWghES/g=
=kyqs
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: