Source: elfutils
Version: 0.166-2
Severity: minor
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
Hi Kurt,
Thank you for applying my cross build patch from #818099. This makes
elfutils practically cross buildable, but cross building it is still
annoying, because its Build-Depends are not cross-satisfiable. There are
two major reasons for that:
* flex is satisfiable, but will result in the host arch flex, which
cannot be run. This is a problem in flex, which Manoj is working on
and nothing can be done about it in elfutils.
* gcc-multilib is not satisfiable, because we haven't implemented cross
toolchain dependency translation yet. Fortunately, we only need that
dependency for running checks, so marking it with the <!nocheck>
profile is sufficient for most cross building scenarios.
Besides that, I noticed two minor issue with the handling of nocheck:
* Due to the use of findstring, it will also recognize e.g. casinocheck
as nocheck. Replacing findstring with filter fixes that.
* Checking is automatically disabled for cross building. While this may
be well-intended, we recognize passing DEB_BUILD_OPTIONS=nocheck as a
responsibility of builders nowadays. This makes packages simpler and
allows cross builds to use qemu for running tests.
To address all of the above, I am proposing the attached match.
Helmut
diff --minimal -Nru elfutils-0.166/debian/changelog
elfutils-0.166/debian/changelog
--- elfutils-0.166/debian/changelog 2016-07-23 18:46:33.000000000 +0200
+++ elfutils-0.166/debian/changelog 2016-07-25 17:15:37.000000000 +0200
@@ -1,3 +1,13 @@
+elfutils (0.166-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Improve DEB_BUILD_OPTIONS=nocheck handling. (Closes: #-1)
+ + Don't treat DEB_BUILD_OPTIONS=casinocheck as nocheck.
+ + Don't default to nocheck for cross building.
+ + Annotate Build-Depends: gcc-multilib with <!nocheck> profile.
+
+ -- Helmut Grohne <hel...@subdivi.de> Mon, 25 Jul 2016 17:12:40 +0200
+
elfutils (0.166-2) unstable; urgency=medium
* Actually add ignore_strmerge.diff to the patch series.
diff --minimal -Nru elfutils-0.166/debian/control elfutils-0.166/debian/control
--- elfutils-0.166/debian/control 2016-07-23 17:24:56.000000000 +0200
+++ elfutils-0.166/debian/control 2016-07-25 17:09:46.000000000 +0200
@@ -1,7 +1,7 @@
Source: elfutils
Priority: optional
Maintainer: Kurt Roeckx <k...@roeckx.be>
-Build-Depends: debhelper (>= 9), autotools-dev, autoconf, automake, bzip2,
zlib1g-dev, libbz2-dev, liblzma-dev, m4, gettext, autoconf, automake, gawk,
dpkg-dev (>= 1.16.1~), gcc-multilib [any-amd64], libc6-dbg [powerpc powerpcspe
ppc64 ppc64el armel armhf arm64], flex, bison
+Build-Depends: debhelper (>= 9), autotools-dev, autoconf, automake, bzip2,
zlib1g-dev, libbz2-dev, liblzma-dev, m4, gettext, autoconf, automake, gawk,
dpkg-dev (>= 1.16.1~), gcc-multilib [any-amd64] <!nocheck>, libc6-dbg [powerpc
powerpcspe ppc64 ppc64el armel armhf arm64], flex, bison
Build-Conflicts: autoconf2.13, automake1.4
Standards-Version: 3.9.8
Section: libs
diff --minimal -Nru elfutils-0.166/debian/rules elfutils-0.166/debian/rules
--- elfutils-0.166/debian/rules 2016-07-23 17:05:25.000000000 +0200
+++ elfutils-0.166/debian/rules 2016-07-25 17:12:37.000000000 +0200
@@ -21,15 +21,10 @@
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += --build=$(DEB_HOST_GNU_TYPE) --enable-maintainer-mode
- make_check = yes
else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
- make_check = no
endif
-ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
- make_check = no
-endif
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter
parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
@@ -57,7 +52,7 @@
$(MAKE) $(MAKEFLAGS)
-ifeq ($(make_check), yes)
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
# Check that those files exist.
-ls -l /proc/$$$$/maps
-ls -l /proc/$$$$/auxv
