Source: squeak-plugins-scratch
Version: 1.4.0.2~svn.r83-2.1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

squeak-plugins-scratch fails to cross build from source, because it uses
the build architecture compiler and pkg-config. After adding the host
architecture as a prefix to these tools, it cross builds successfully.
Please consider applying the attached patch.

Helmut
diff --minimal -Nru squeak-plugins-scratch-1.4.0.2~svn.r83/debian/changelog 
squeak-plugins-scratch-1.4.0.2~svn.r83/debian/changelog
--- squeak-plugins-scratch-1.4.0.2~svn.r83/debian/changelog     2015-07-19 
15:55:23.000000000 +0200
+++ squeak-plugins-scratch-1.4.0.2~svn.r83/debian/changelog     2017-09-25 
19:42:10.000000000 +0200
@@ -1,3 +1,10 @@
+squeak-plugins-scratch (1.4.0.2~svn.r83-2.2) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Use triplet-prefixed tools. Closes: #-1
+
+ -- Helmut Grohne <hel...@subdivi.de>  Mon, 25 Sep 2017 19:42:10 +0200
+
 squeak-plugins-scratch (1.4.0.2~svn.r83-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --minimal -Nru squeak-plugins-scratch-1.4.0.2~svn.r83/debian/rules 
squeak-plugins-scratch-1.4.0.2~svn.r83/debian/rules
--- squeak-plugins-scratch-1.4.0.2~svn.r83/debian/rules 2015-07-19 
15:54:17.000000000 +0200
+++ squeak-plugins-scratch-1.4.0.2~svn.r83/debian/rules 2017-09-25 
19:42:08.000000000 +0200
@@ -1,7 +1,13 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/architecture.mk
+
 export DH_ALWAYS_EXCLUDE=.svn
 
+ifeq ($(origin CC),default)
+CC = $(DEB_HOST_GNU_TYPE)-gcc
+endif
+PKG_CONFIG ?= $(DEB_HOST_GNU_TYPE)-pkg-config
 LDFLAGS=-Wl,-z,defs -Wl,--as-needed -Wl,--no-undefined
 CFLAGS=-std=gnu89
 
@@ -15,21 +21,21 @@
 build-stamp: config
        dh_testdir
        cd camera/ && \
-               gcc $(CFLAGS) -fPIC -c *.c
+               $(CC) $(CFLAGS) -fPIC -c *.c
        cd camera/ && \
-               gcc $(LDFLAGS) -shared *.o -lv4l2 -ldl -o so.CameraPlugin
+               $(CC) $(LDFLAGS) -shared *.o -lv4l2 -ldl -o so.CameraPlugin
        cd scratch/ && \
-               gcc $(CFLAGS) -fPIC -c *.c
+               $(CC) $(CFLAGS) -fPIC -c *.c
        cd scratch/ && \
-               gcc $(LDFLAGS) -shared *.o -lm -o so.ScratchPlugin
+               $(CC) $(LDFLAGS) -shared *.o -lm -o so.ScratchPlugin
        cd unicode/ && \
-               gcc $(CFLAGS) -fPIC -c `pkg-config --cflags pangocairo` *.c
+               $(CC) $(CFLAGS) -fPIC -c `$(PKG_CONFIG) --cflags pangocairo` *.c
        cd unicode/ && \
-               gcc $(LDFLAGS) -shared *.o `pkg-config --libs pangocairo` -lc 
-o so.UnicodePlugin
+               $(CC) $(LDFLAGS) -shared *.o `$(PKG_CONFIG) --libs pangocairo` 
-lc -o so.UnicodePlugin
        cd wedo/ && \
-               gcc $(CFLAGS) -fPIC -c *.c
+               $(CC) $(CFLAGS) -fPIC -c *.c
        cd wedo/ && \
-               gcc $(LDFLAGS) -shared *.o -o so.WeDoPlugin
+               $(CC) $(LDFLAGS) -shared *.o -o so.WeDoPlugin
        touch $@
 
 clean: 

Reply via email to