Source: zita-bls1
Version: 0.1.0-3.1
Tags: patch upstream
User: helm...@debian.org
Usertags: rebootstrap

zita-bls1 fails to cross build from source, because its upstream
Makefile hard codes build architecture build tools. After making them
substitutable, it cross builds successfully. Please consider applying
the attached patch.

Helmut
--- zita-bls1-0.1.0.orig/source/Makefile
+++ zita-bls1-0.1.0/source/Makefile
@@ -19,6 +19,7 @@
 # --------------------------------------------------------------------------
 
 
+PKG_CONFIG ?= pkg-config
 PREFIX = /usr
 SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
 LIBDIR = lib$(SUFFIX)
@@ -36,11 +37,11 @@
 
 ZITA-BLS1_O = zita-bls1.o styles.o jclient.o mainwin.o png2img.o guiclass.o rotary.o \
 	hp3filt.o lfshelf2.o shuffler.o
-zita-bls1:	CPPFLAGS += -I/usr/X11R6/include `pkg-config --cflags xft`
+zita-bls1:	CPPFLAGS += -I/usr/X11R6/include `$(PKG_CONFIG) --cflags xft`
 zita-bls1:	LDLIBS += -lzita-convolver -lfftw3f -lclxclient -lclthreads -ljack -lcairo -lpthread -lpng -lXft -lX11 -lrt
 zita-bls1:	LDFLAGS += -L/usr/X11R6/lib
 zita-bls1:	$(ZITA-BLS1_O)
-	g++ $(LDFLAGS) -o $@ $(ZITA-BLS1_O) $(LDLIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(ZITA-BLS1_O) $(LDLIBS)
 
 $(ZITA-BLS1_O):
 -include $(ZITA-BLS1_O:%.o=%.d)

Reply via email to