Bug#838866: vorbis-tools FTCBFS: does not honour DEB_BUILD_OPTIONS=nocheck

Sun Nov 19 00:42:50 UTC 2017

Control: tags -1 + pending


Hi,

2017-10-10 23:13 Manuel A. Fernandez Montecelo:
>Hi,
>
>2016-09-25 23:16 Helmut Grohne:
>>Source: vorbis-tools
>>Version: 1.4.0-10
>>Tags: patch
>>User: helmutg at debian.org
>>Usertags: rebootstrap
>>
>>vorbis-tools fails to cross build from source, because it runs tests
>>even when invoked with DEB_BUILD_OPTIONS=nocheck. Tests naturally fail,
>>because host architecture executables cannot be executed at all in a
>>cross build setting. The attached patch implements the necessary
>>handling of DEB_BUILD_OPTIONS=nocheck. Please consider applying it.
>>
>>After applying it, vorbis-tools does not become cross buildable. It also
>>fails to find ao.pc using pkg-config, because ao.pc does not live in a
>>multiarch path. So #638741 needs to be fixed as well for actually cross
>>building vorbis-tools.
>
>This patch looks sensible and worth on its own right, and I would like
>to get it applied.
>
>Does it help if I prepare a NMU for this?

I am uploading a NMU for this, .debdiff attached.

As it happens, all changes have been present for months in VCS, just not
released.

Uploading to delayed/10.  If it can be released early please tell me, if
you want me to cancel it or you want to release the changes yourself,
please tell me as well.

Cheers and thanks.

-- 
Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
-------------- next part --------------
diff -Nru vorbis-tools-1.4.0/debian/changelog vorbis-tools-1.4.0/debian/changelog

--- vorbis-tools-1.4.0/debian/changelog	2016-05-26 10:23:37.000000000 +0200
+++ vorbis-tools-1.4.0/debian/changelog	2017-11-19 01:00:44.000000000 +0100
@@ -1,3 +1,20 @@
+vorbis-tools (1.4.0-10.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+    - Uploading changes already applied in VCS
+
+  [ Petter Reinholdtsen ]
+  * Add git link to patches applied upstream.
+    - 0002-Don-t-corrupt-stdout.patch
+    - 0003-Floating-point-comparison-fails.patch
+  * Changed Standards-Version from 3.9.6 to 3.9.8.
+  * Added CPE id in d/upstream/metadata for future reference.
+
+  [ Helmut Grohne ]
+  * Do not run tests under DEB_BUILD_OPTIONS=nocheck (Closes: #838866)
+
+ -- Manuel A. Fernandez Montecelo <mafm at debian.org>  Sun, 19 Nov 2017 01:00:44 +0100
+
 vorbis-tools (1.4.0-10) unstable; urgency=medium
 
   * Drop debconf from autopkgtest dependencies.  We do not anything
diff -Nru vorbis-tools-1.4.0/debian/control vorbis-tools-1.4.0/debian/control
--- vorbis-tools-1.4.0/debian/control	2016-05-26 10:23:37.000000000 +0200
+++ vorbis-tools-1.4.0/debian/control	2017-11-19 01:00:44.000000000 +0100
@@ -17,7 +17,7 @@
  , libvorbis-dev (>= 1.3.0)
  , libkate-dev
  , pkg-config
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-xiph/vorbis-tools.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xiph/vorbis-tools.git
 Homepage: http://www.xiph.org/
diff -Nru vorbis-tools-1.4.0/debian/patches/0002-Don-t-corrupt-stdout.patch vorbis-tools-1.4.0/debian/patches/0002-Don-t-corrupt-stdout.patch
--- vorbis-tools-1.4.0/debian/patches/0002-Don-t-corrupt-stdout.patch	2016-05-26 10:23:37.000000000 +0200
+++ vorbis-tools-1.4.0/debian/patches/0002-Don-t-corrupt-stdout.patch	2017-11-19 01:00:44.000000000 +0100
@@ -3,6 +3,7 @@
 Subject: Don't corrupt stdout
 
 Bug-Debian: https://bugs.debian.org/595104
+Applied-Upstream: https://git.xiph.org/?p=vorbis-tools.git;a=commitdiff;h=c60fd5d452318c2e25c43a5b3b15b5ca90ac23ef
 ---
  oggdec/oggdec.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff -Nru vorbis-tools-1.4.0/debian/patches/0003-Floating-point-comparison-fails.patch vorbis-tools-1.4.0/debian/patches/0003-Floating-point-comparison-fails.patch
--- vorbis-tools-1.4.0/debian/patches/0003-Floating-point-comparison-fails.patch	2016-05-26 10:23:37.000000000 +0200
+++ vorbis-tools-1.4.0/debian/patches/0003-Floating-point-comparison-fails.patch	2017-11-19 01:00:44.000000000 +0100
@@ -3,7 +3,7 @@
 Subject: Floating point comparison fails.
 
 Last-Update: 2011-07-20
-Forwarded: no
+Applied-Upstream: https://git.xiph.org/?p=vorbis-tools.git;a=commitdiff;h=3d014b1921d946bdca53d9434b8158c24dfdad8c
 Bug-Debian: https://bugs.debian.org/328266
 Bug-Debian: https://bugs.debian.org/634855
 
diff -Nru vorbis-tools-1.4.0/debian/rules vorbis-tools-1.4.0/debian/rules
--- vorbis-tools-1.4.0/debian/rules	2016-05-26 10:23:37.000000000 +0200
+++ vorbis-tools-1.4.0/debian/rules	2017-11-19 01:00:44.000000000 +0100
@@ -28,8 +28,10 @@
 #CFLAGS += -D_FILE_OFFSET_BITS=64
 
 # Run our test suite until the upstream source get one
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 override_dh_auto_test:
 	dh_auto_test
 	for t in debian/tests/test-*; do \
 	    BUILDDIR=`pwd` $$t; \
 	done
+endif
diff -Nru vorbis-tools-1.4.0/debian/upstream/metadata vorbis-tools-1.4.0/debian/upstream/metadata
--- vorbis-tools-1.4.0/debian/upstream/metadata	1970-01-01 01:00:00.000000000 +0100
+++ vorbis-tools-1.4.0/debian/upstream/metadata	2017-11-19 01:00:44.000000000 +0100
@@ -0,0 +1 @@
+CPE: cpe:/a:xiph:vorbis-tools
