Source: zita-mu1 Version: 0.2.2-2 Tags: patch User: helm...@debian.org Usertags: rebootstrap
zita-mu1 fails to cross build from source for two reasons: * Its build dependency on binutils (host arch) conflicts with the implicit dependency on binutils via build-essential (build arch). In theory, we'd need "toolchain dependency cross translation" here, but it is much simpler to just drop the implicitly satisfied dependency. * The upstream Makefile hard codes the build architecture compiler g++. It should be using $(CXX). After fixing both, zita-mu1 cross builds successfully. Please consider applying the attached patch. Helmut
diff --minimal -Nru zita-mu1-0.2.2/debian/changelog zita-mu1-0.2.2/debian/changelog --- zita-mu1-0.2.2/debian/changelog 2016-12-27 16:02:53.000000000 +0100 +++ zita-mu1-0.2.2/debian/changelog 2017-08-28 15:46:32.000000000 +0200 @@ -1,3 +1,12 @@ +zita-mu1 (0.2.2-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTCBFS: (Closes: #-1) + + Drop implicitly satisfied build dependency on binutils. + + Make g++ substitutable in source/Makefile. + + -- Helmut Grohne <hel...@subdivi.de> Mon, 28 Aug 2017 15:46:32 +0200 + zita-mu1 (0.2.2-2) unstable; urgency=medium * Set dh/compat 10. diff --minimal -Nru zita-mu1-0.2.2/debian/control zita-mu1-0.2.2/debian/control --- zita-mu1-0.2.2/debian/control 2016-12-27 16:02:44.000000000 +0100 +++ zita-mu1-0.2.2/debian/control 2017-08-28 15:46:30.000000000 +0200 @@ -5,7 +5,6 @@ Uploaders: JaromÃr MikeÅ¡ <mira.mi...@seznam.cz> Build-Depends: - binutils, debhelper (>= 10), libcairo2-dev, libclthreads-dev (>= 2.4.0), diff --minimal -Nru zita-mu1-0.2.2/debian/patches/01-makefile.patch zita-mu1-0.2.2/debian/patches/01-makefile.patch --- zita-mu1-0.2.2/debian/patches/01-makefile.patch 2015-09-04 08:27:44.000000000 +0200 +++ zita-mu1-0.2.2/debian/patches/01-makefile.patch 2017-08-28 15:46:32.000000000 +0200 @@ -1,14 +1,15 @@ Description: Put DESTDIR before PREFIX to set the installation path properly. Set prefix properly and removed -march=native cpp flag Fix install + Fix CXX substitutability Author: JaromÃr MikeÅ¡ <mira.mi...@seznam.cz> Forwarded: Fons Adriaensen <f...@linuxaudio.org> Index: zita-mu1/source/Makefile =================================================================== --- zita-mu1.orig/source/Makefile +++ zita-mu1/source/Makefile @@ -22,13 +22,13 @@ PROGRAM = zita-mu1 VERSION = 0.2.2 SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/') @@ -24,7 +25,15 @@ LDFLAGS += -L$(PREFIX)/$(LIBDIR) -@@ -49,8 +49,9 @@ $(ZITA-MU1_O): +@@ -42,15 +42,16 @@ + zita-mu1: LDLIBS += -lsndfile -lclxclient -lclthreads -ljack -lpthread -lcairo -lpng -lXft -lX11 -lrt + zita-mu1: LDFLAGS += -L/usr/X11R6/lib + zita-mu1: $(ZITA-MU1_O) +- g++ $(LDFLAGS) -o $@ $(ZITA-MU1_O) $(LDLIBS) ++ $(CXX) $(LDFLAGS) -o $@ $(ZITA-MU1_O) $(LDLIBS) + + $(ZITA-MU1_O): + -include $(ZITA-MU1_O:%.o=%.d) install: all
_______________________________________________ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
