Source: thin-provisioning-tools
Version: 0.7.4-2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
thing-provisioning-tools fails to cross build from source. One reason is
that Makefile.in hard codes "gcc" in one place despite having determined
the right $(CC) at configure time. The other is that debian/rules fails
to honour DEB_BUILD_OPTIONS=nocheck. After fixing both,
thing-provisioning-tools cross builds successfully. Please consider
applying the attached patch.
Helmut
diff --minimal -Nru thin-provisioning-tools-0.7.4/debian/changelog
thin-provisioning-tools-0.7.4/debian/changelog
--- thin-provisioning-tools-0.7.4/debian/changelog 2017-11-01
20:34:04.000000000 +0100
+++ thin-provisioning-tools-0.7.4/debian/changelog 2018-06-03
06:57:56.000000000 +0200
@@ -1,3 +1,12 @@
+thin-provisioning-tools (0.7.4-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #-1)
+ + cross.patch: Don't hard code gcc in Makefile.in.
+ + Honour DEB_BUILD_OPTIONS=nocheck.
+
+ -- Helmut Grohne <hel...@subdivi.de> Sun, 03 Jun 2018 06:57:56 +0200
+
thin-provisioning-tools (0.7.4-2) unstable; urgency=medium
* Update unit-test workaround to work with current glibc.
diff --minimal -Nru thin-provisioning-tools-0.7.4/debian/patches/cross.patch
thin-provisioning-tools-0.7.4/debian/patches/cross.patch
--- thin-provisioning-tools-0.7.4/debian/patches/cross.patch 1970-01-01
01:00:00.000000000 +0100
+++ thin-provisioning-tools-0.7.4/debian/patches/cross.patch 2018-06-03
06:57:54.000000000 +0200
@@ -0,0 +1,11 @@
+--- thin-provisioning-tools-0.7.4.orig/Makefile.in
++++ thin-provisioning-tools-0.7.4/Makefile.in
+@@ -325,7 +325,7 @@
+ LIBFT_OBJECTS=$(subst .c,.o,$(LIBFT_SOURCE))
+
+ lib/libft.so: $(LIBFT_OBJECTS)
+- gcc -shared -o $@ $+ -laio
++ $(CC) -shared -o $@ $+ -laio
+
+ .PHONEY: functional-test unit-test
+
diff --minimal -Nru thin-provisioning-tools-0.7.4/debian/patches/series
thin-provisioning-tools-0.7.4/debian/patches/series
--- thin-provisioning-tools-0.7.4/debian/patches/series 2017-11-01
18:01:40.000000000 +0100
+++ thin-provisioning-tools-0.7.4/debian/patches/series 2018-06-03
06:57:38.000000000 +0200
@@ -1 +1,2 @@
0001-Fix-build-system.patch
+cross.patch
diff --minimal -Nru thin-provisioning-tools-0.7.4/debian/rules
thin-provisioning-tools-0.7.4/debian/rules
--- thin-provisioning-tools-0.7.4/debian/rules 2017-11-01 18:01:40.000000000
+0100
+++ thin-provisioning-tools-0.7.4/debian/rules 2018-06-03 06:56:20.000000000
+0200
@@ -14,9 +14,11 @@
--enable-testing \
--with-optimisation=-O2
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
override_dh_auto_test:
$(MAKE) -C debian/unit-tests all
+LD_PRELOAD=$(CURDIR)/debian/unit-tests/preload.so $(MAKE) unit-test
GMOCK_DIR=/usr/src/googletest
+endif
override_dh_auto_clean:
dh_auto_clean
