Source: xf86-input-multitouch
Version: 1.0~rc3-1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
xf86-input-multitouch fails to cross build from source, because the
upstream build system hard codes the build architecture compiler "gcc"
and the packaging does not pass cross compilers to make. After fixing
both, xf86-input-multitouch cross builds successfully. Please consider
applying the attached patch.
Helmut
diff --minimal -Nru xf86-input-multitouch-1.0~rc3/debian/changelog
xf86-input-multitouch-1.0~rc3/debian/changelog
--- xf86-input-multitouch-1.0~rc3/debian/changelog 2017-07-14
03:59:29.000000000 +0200
+++ xf86-input-multitouch-1.0~rc3/debian/changelog 2017-11-04
20:52:45.000000000 +0100
@@ -1,3 +1,12 @@
+xf86-input-multitouch (1.0~rc3-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #-1)
+ + Let dh_auto_build pass cross compilers to make.
+ + 03_cross.patch: Make gcc substitutable.
+
+ -- Helmut Grohne <hel...@subdivi.de> Sat, 04 Nov 2017 20:52:45 +0100
+
xf86-input-multitouch (1.0~rc3-1) unstable; urgency=medium
* New upstream release. (Closes: #826008)
diff --minimal -Nru xf86-input-multitouch-1.0~rc3/debian/patches/03_cross.patch
xf86-input-multitouch-1.0~rc3/debian/patches/03_cross.patch
--- xf86-input-multitouch-1.0~rc3/debian/patches/03_cross.patch 1970-01-01
01:00:00.000000000 +0100
+++ xf86-input-multitouch-1.0~rc3/debian/patches/03_cross.patch 2017-11-04
20:52:45.000000000 +0100
@@ -0,0 +1,31 @@
+From: Helmut Grohne <hel...@subdivi.de>
+Subject: allow substituting the compiler for cross compilation
+
+Index: xf86-input-multitouch-1.0~rc3/Makefile
+===================================================================
+--- xf86-input-multitouch-1.0~rc3.orig/Makefile
++++ xf86-input-multitouch-1.0~rc3/Makefile
+@@ -39,19 +39,19 @@
+
+ bin/%: obj/%.o $(OBJS)
+ @mkdir -p $(@D)
+- gcc $< -o $@ $(OBJS) $(LIBS)
++ $(CC) $< -o $@ $(OBJS) $(LIBS)
+
+ $(TLIB): $(OBJS) $(XOBJS)
+ @rm -f $(TLIB)
+- gcc -shared $(OBJS) $(XOBJS) $(LIBS) -Wl,-soname -Wl,$(LIBRARY) -o $@
++ $(CC) -shared $(OBJS) $(XOBJS) $(LIBS) -Wl,-soname -Wl,$(LIBRARY) -o $@
+
+ obj/%.o: %.c
+ @mkdir -p $(@D)
+- gcc $(INCLUDE) $(OPTS) -c $< -o $@
++ $(CC) $(INCLUDE) $(OPTS) -c $< -o $@
+
+ obj/%.o: %.cc
+ @mkdir -p $(@D)
+- gcc $(INCLUDE) $(OPTS) -c $< -o $@
++ $(CC) $(INCLUDE) $(OPTS) -c $< -o $@
+
+ clean:
+ rm -rf bin obj
diff --minimal -Nru xf86-input-multitouch-1.0~rc3/debian/patches/series
xf86-input-multitouch-1.0~rc3/debian/patches/series
--- xf86-input-multitouch-1.0~rc3/debian/patches/series 2017-07-14
03:58:40.000000000 +0200
+++ xf86-input-multitouch-1.0~rc3/debian/patches/series 2017-11-04
20:52:45.000000000 +0100
@@ -1,2 +1,3 @@
01_change_modulename.patch
02_optimize_O2.patch
+03_cross.patch
diff --minimal -Nru xf86-input-multitouch-1.0~rc3/debian/rules
xf86-input-multitouch-1.0~rc3/debian/rules
--- xf86-input-multitouch-1.0~rc3/debian/rules 2017-07-14 03:58:40.000000000
+0200
+++ xf86-input-multitouch-1.0~rc3/debian/rules 2017-11-04 20:52:43.000000000
+0100
@@ -18,7 +18,7 @@
dh_install --fail-missing
override_dh_auto_build:
- $(MAKE) CFLAGS="$(CFLAGS)"
+ dh_auto_build -- CFLAGS="$(CFLAGS)"
override_dh_shlibdeps:
dh_shlibdeps -- --warnings=6
