Bug#1003392: zita-dc1 FTCBFS: uses build architecture tools
Source: zita-dc1
Version: 0.3.3-1
Tags: patch upstream
User: debian-cross@lists.debian.org
Usertags: ftcbfs
zita-dc1 fails to cross build from source, because it uses build
architecture build tools in two occasions. For one thing, it uses the
build architecture pkg-config, because it uses the non-standard
substitution variable PKG_CONF rather than PKG_CONFIG, the latter of
which is substituted by dh_auto_build. The other aspect is hard coding
g++ instead of using $(CXX). Please consider applying the attached patch
to make zita-dc1 cross buildable.
Helmut
--- zita-dc1-0.3.3.orig/source/Makefile
+++ zita-dc1-0.3.3/source/Makefile
@@ -21,7 +21,8 @@
PREFIX ?= /usr/local
BINDIR ?= $(PREFIX)/bin
SHARED ?= $(PREFIX)/share/zita-dc1
-PKG_CONF ?= pkg-config
+CXX ?= g++
+PKG_CONFIG ?= pkg-config
VERSION = 0.3.3
CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" -DSHARED=\"$(SHARED)\"
@@ -33,11 +34,11 @@
ZITA-DC1_O = zita-dc1.o styles.o jclient.o mainwin.o png2img.o guiclass.o \
button.o rotary.o gmeter.o dyncom1.o
-zita-dc1: CPPFLAGS += $(shell $(PKG_CONF) --cflags freetype2)
+zita-dc1: CPPFLAGS += $(shell $(PKG_CONFIG) --cflags freetype2)
zita-dc1: LDLIBS += -lclxclient -lclthreads -ljack -lpng -lpthread \
-lcairo -lXft -lX11 -lrt
zita-dc1: $(ZITA-DC1_O)
- g++ $(LDFLAGS) -o $@ $(ZITA-DC1_O) $(LDLIBS)
+ $(CXX) $(LDFLAGS) -o $@ $(ZITA-DC1_O) $(LDLIBS)
$(ZITA-DC1_O):
-include $(ZITA-DC1_O:%.o=%.d)
Reply to: