Source: elfutils
Version: 0.170-0.5
Severity: important
Justification: fails to build from source (but built successfully in the past)

debian/patches/testsuite-core-files.diff essentially cleans up
a core file that is only created when the architecture to be
tested does not support unwinding as tested in run-backtrace-dwarf.sh
which made the “rmdir” after the test fail.

The change to debian/rules lets me successfully build this.
It might be related to eatmydata, or not, but it’s actually
nontrivial to disable eatmydata in my cowbuilder environment…

Please apply with the next regular upload to unstable.

Thanks!
diff -Nru elfutils-0.170/debian/changelog elfutils-0.170/debian/changelog
--- elfutils-0.170/debian/changelog     2018-06-24 20:54:50.000000000 +0200
+++ elfutils-0.170/debian/changelog     2018-08-01 17:53:57.000000000 +0200
@@ -1,3 +1,11 @@
+elfutils (0.170-0.5+x32.1) unreleased; urgency=medium
+
+  * Non-maintainer upload.
+  * Disable biarch tests on x32 to fix FTBFS.
+  * Patch testsuite to clean up core files created on some targets.
+
+ -- Thorsten Glaser <t...@mirbsd.de>  Wed, 01 Aug 2018 17:53:57 +0200
+
 elfutils (0.170-0.5) unstable; urgency=medium
 
   * Non-maintainer upload acked by Kurt Roeckx.
diff -Nru elfutils-0.170/debian/patches/series 
elfutils-0.170/debian/patches/series
--- elfutils-0.170/debian/patches/series        2018-04-09 14:21:19.000000000 
+0200
+++ elfutils-0.170/debian/patches/series        2018-08-01 17:52:25.000000000 
+0200
@@ -13,3 +13,4 @@
 disable_werror.patch
 GNU_variable_value.patch
 locviews.patch
+testsuite-core-files.diff
diff -Nru elfutils-0.170/debian/patches/testsuite-core-files.diff 
elfutils-0.170/debian/patches/testsuite-core-files.diff
--- elfutils-0.170/debian/patches/testsuite-core-files.diff     1970-01-01 
01:00:00.000000000 +0100
+++ elfutils-0.170/debian/patches/testsuite-core-files.diff     2018-08-01 
17:53:50.000000000 +0200
@@ -0,0 +1,11 @@
+# DP: fix FTBFS on x32 where unwinding is not supported
+
+--- a/tests/run-backtrace-dwarf.sh
++++ b/tests/run-backtrace-dwarf.sh
+@@ -28,3 +28,6 @@ tempfiles dwarf.{bt,err}
+ cat dwarf.{bt,err}
+ check_native_unsupported dwarf.err dwarf
+ check_main dwarf.bt dwarf
++# running this on architectures not supporting unwinding calls abort()
++# causing core dump creation
++rm -f core
diff -Nru elfutils-0.170/debian/rules elfutils-0.170/debian/rules
--- elfutils-0.170/debian/rules 2017-09-06 10:11:35.000000000 +0200
+++ elfutils-0.170/debian/rules 2018-08-01 17:29:17.000000000 +0200
@@ -15,6 +15,7 @@
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
+DEB_HOST_ARCH       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -25,6 +26,10 @@
         confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
 
+ifneq (,$(filter x32,$(DEB_HOST_ARCH)))
+       confenv += utrace_cv_cc_biarch=no
+endif
+
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
     NUMJOBS = $(patsubst parallel=%,%,$(filter 
parallel=%,$(DEB_BUILD_OPTIONS)))
     MAKEFLAGS += -j$(NUMJOBS)
@@ -37,12 +42,12 @@
        dh_testdir
        autoreconf -fis
 ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-       ./configure --enable-maintainer-mode
+       $(confenv) ./configure --enable-maintainer-mode
        $(MAKE) $(MAKEFLAGS)
        $(MAKE) clean
 endif
        CFLAGS="$(CFLAGS) -O3" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
-               ./configure $(confflags) --prefix=/usr \
+               $(confenv) ./configure $(confflags) --prefix=/usr \
                --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
                --program-prefix=eu- --disable-silent-rules
 

Reply via email to