[Pkg-uml-pkgs] Bug#850930: uml-utilities FTCBFS:

[Helmut Grohne]

Source: uml-utilities
Version: 20070815.1-2
Severity: normal
Tags: patch

uml-utilities fail to cross build from source, because they generally
use build architecture tools where host architecture tools should be
used. Indirecting the explicit $(MAKE) invocation through dh_auto_build
takes care of supplying cross compilers already. Unfortunately,
uml-utilities generally pass -s to install which causes stripping. This
breaks both -dbgsym packages (as dh_strip will not see debug symbols)
and cross building (as install uses the build architecture strip). So
the -s flag needs to be removed or nullified. The attached patch fixes
these issues and makes cross building successful. Please consider
applying it.

Helmut
-------------- next part --------------
diff --minimal -Nru uml-utilities-20070815.1/debian/changelog uml-utilities-20070815.1/debian/changelog
--- uml-utilities-20070815.1/debian/changelog	2016-08-16 17:44:59.000000000 +0200
+++ uml-utilities-20070815.1/debian/changelog	2017-01-11 11:28:39.000000000 +0100
@@ -1,3 +1,12 @@
+uml-utilities (20070815.1-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
+    + Let dh_auto_build pass cross compilers
+    + Do not strip during install
+
+ -- Helmut Grohne <helmut at subdivi.de>  Wed, 11 Jan 2017 11:28:39 +0100
+
 uml-utilities (20070815.1-2) unstable; urgency=medium
 
   * Fix path of tunctl invocation.
diff --minimal -Nru uml-utilities-20070815.1/debian/patches/nostrip.patch uml-utilities-20070815.1/debian/patches/nostrip.patch
--- uml-utilities-20070815.1/debian/patches/nostrip.patch	1970-01-01 01:00:00.000000000 +0100
+++ uml-utilities-20070815.1/debian/patches/nostrip.patch	2017-01-11 11:28:39.000000000 +0100
@@ -0,0 +1,109 @@
+From: Helmut Grohne <helmut at subdivi.de>
+Subject: do not strip during install
+
+ * Makes -dbgsym packages work.
+ * Makes cross building work as install uses the wrong strip.
+
+Index: uml-utilities-20070815.1/jail/Makefile
+===================================================================
+--- uml-utilities-20070815.1.orig/jail/Makefile
++++ uml-utilities-20070815.1/jail/Makefile
+@@ -11,7 +11,7 @@
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(SBIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(SBIN_DIR)
++	install $(BIN) $(DESTDIR)$(SBIN_DIR)
+ 
+ clean :
+ 	rm -rf *~ $(BIN) $(OBJS) cell[0-9]* core* tty_log_cell*
+Index: uml-utilities-20070815.1/jailtest/Makefile
+===================================================================
+--- uml-utilities-20070815.1.orig/jailtest/Makefile
++++ uml-utilities-20070815.1/jailtest/Makefile
+@@ -14,4 +14,4 @@
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++	install $(BIN) $(DESTDIR)$(BIN_DIR)
+Index: uml-utilities-20070815.1/mconsole/Makefile
+===================================================================
+--- uml-utilities-20070815.1.orig/mconsole/Makefile
++++ uml-utilities-20070815.1/mconsole/Makefile
+@@ -15,4 +15,4 @@
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++	install $(BIN) $(DESTDIR)$(BIN_DIR)
+Index: uml-utilities-20070815.1/moo/Makefile
+===================================================================
+--- uml-utilities-20070815.1.orig/moo/Makefile
++++ uml-utilities-20070815.1/moo/Makefile
+@@ -23,4 +23,4 @@
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++	install $(BIN) $(DESTDIR)$(BIN_DIR)
+Index: uml-utilities-20070815.1/port-helper/Makefile
+===================================================================
+--- uml-utilities-20070815.1.orig/port-helper/Makefile
++++ uml-utilities-20070815.1/port-helper/Makefile
+@@ -15,4 +15,4 @@
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(LIB_DIR)
+-	install -s $(BIN) $(DESTDIR)$(LIB_DIR)
++	install $(BIN) $(DESTDIR)$(LIB_DIR)
+Index: uml-utilities-20070815.1/tunctl/Makefile
+===================================================================
+--- uml-utilities-20070815.1.orig/tunctl/Makefile
++++ uml-utilities-20070815.1/tunctl/Makefile
+@@ -14,4 +14,4 @@
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++	install $(BIN) $(DESTDIR)$(BIN_DIR)
+Index: uml-utilities-20070815.1/uml_net/Makefile
+===================================================================
+--- uml-utilities-20070815.1.orig/uml_net/Makefile
++++ uml-utilities-20070815.1/uml_net/Makefile
+@@ -22,4 +22,4 @@
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s -m 04755 $(BIN) $(DESTDIR)$(BIN_DIR)
++	install -m 04755 $(BIN) $(DESTDIR)$(BIN_DIR)
+Index: uml-utilities-20070815.1/uml_switch/Makefile
+===================================================================
+--- uml-utilities-20070815.1.orig/uml_switch/Makefile
++++ uml-utilities-20070815.1/uml_switch/Makefile
+@@ -21,4 +21,4 @@
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++	install $(BIN) $(DESTDIR)$(BIN_DIR)
+Index: uml-utilities-20070815.1/umlfs/Makefile
+===================================================================
+--- uml-utilities-20070815.1.orig/umlfs/Makefile
++++ uml-utilities-20070815.1/umlfs/Makefile
+@@ -16,4 +16,4 @@
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++	install $(BIN) $(DESTDIR)$(BIN_DIR)
+Index: uml-utilities-20070815.1/watchdog/Makefile
+===================================================================
+--- uml-utilities-20070815.1.orig/watchdog/Makefile
++++ uml-utilities-20070815.1/watchdog/Makefile
+@@ -14,4 +14,4 @@
+ 
+ install : $(BIN)
+ 	install -d $(DESTDIR)$(BIN_DIR)
+-	install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++	install $(BIN) $(DESTDIR)$(BIN_DIR)
diff --minimal -Nru uml-utilities-20070815.1/debian/patches/series uml-utilities-20070815.1/debian/patches/series
--- uml-utilities-20070815.1/debian/patches/series	2016-08-16 17:40:23.000000000 +0200
+++ uml-utilities-20070815.1/debian/patches/series	2017-01-11 11:28:39.000000000 +0100
@@ -1,3 +1,4 @@
 leave_uml_util.spec.alone.patch
 dont_link_against_ncurses.patch
 add_tun_mode_to_tunctl.patch
+nostrip.patch
diff --minimal -Nru uml-utilities-20070815.1/debian/rules uml-utilities-20070815.1/debian/rules
--- uml-utilities-20070815.1/debian/rules	2016-08-16 17:44:54.000000000 +0200
+++ uml-utilities-20070815.1/debian/rules	2017-01-11 11:28:39.000000000 +0100
@@ -25,7 +25,7 @@
 ifeq "$(DEB_BUILD_ARCH)" "arm"
 	touch tunctl/tunctl
 endif
-	$(MAKE)
+	dh_auto_build
 
 	for man in debian/*.sgml; do \
 		docbook-to-man $$man > `dirname $$man`/`basename $$man .sgml`.1; \