Source: vdr-plugin-games Version: 0.6.3-46.1 Tags: patch User: debian-cr...@lists.debian.org Usertags: ftcbfs
vdr-plugin-games fails to cross build from source. The upstream Makefiles hard code g++ in a few occasions and debian/rules hard codes pkg-config. The attached patch fixes both. Please consider applying it. Helmut
diff --minimal -Nru vdr-plugin-games-0.6.3/debian/changelog vdr-plugin-games-0.6.3/debian/changelog --- vdr-plugin-games-0.6.3/debian/changelog 2017-09-16 11:22:32.000000000 +0200 +++ vdr-plugin-games-0.6.3/debian/changelog 2020-02-09 06:58:34.000000000 +0100 @@ -1,3 +1,12 @@ +vdr-plugin-games (0.6.3-46.2) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTCBFS: (Closes: #-1) + + Supply pkg-config from dpkg's buildtools.mk. + + cross.patch: Make g++ substitutable. + + -- Helmut Grohne <hel...@subdivi.de> Sun, 09 Feb 2020 06:58:34 +0100 + vdr-plugin-games (0.6.3-46.1) unstable; urgency=medium * Non-maintainer upload diff --minimal -Nru vdr-plugin-games-0.6.3/debian/patches/cross.patch vdr-plugin-games-0.6.3/debian/patches/cross.patch --- vdr-plugin-games-0.6.3/debian/patches/cross.patch 1970-01-01 01:00:00.000000000 +0100 +++ vdr-plugin-games-0.6.3/debian/patches/cross.patch 2020-02-09 06:58:34.000000000 +0100 @@ -0,0 +1,56 @@ +--- vdr-plugin-games-0.6.3.orig/Makefile ++++ vdr-plugin-games-0.6.3/Makefile +@@ -64,11 +64,11 @@ + @echo + + libvdr-games.so: $(OBJS) +- g++ $(OBJS) $(LFLAGS) $(ARCHIVES) -o $@ ++ $(CXX) $(OBJS) $(LFLAGS) $(ARCHIVES) -o $@ + @cp $@ $(LIBDIR)/$@.$(APIVERSION) + + sdl-games: $(OBJS) +- g++ $(OBJS) $(LFLAGS) $(ARCHIVES) -o $@ ++ $(CXX) $(OBJS) $(LFLAGS) $(ARCHIVES) -o $@ + + install: all + @cp $(LIBDIR)/libvdr-games.so.$(VDRVER) /mnt/vdr/lib/plugins/ +--- vdr-plugin-games-0.6.3.orig/minesweeper/Makefile ++++ vdr-plugin-games-0.6.3/minesweeper/Makefile +@@ -11,4 +11,4 @@ + + .cpp.o: + @echo -n "." +- g++ $(DEFINES) $(CFLAGS) -c $< ++ $(CXX) $(DEFINES) $(CFLAGS) -c $< +--- vdr-plugin-games-0.6.3.orig/snake/Makefile ++++ vdr-plugin-games-0.6.3/snake/Makefile +@@ -11,4 +11,4 @@ + + .cpp.o: + @echo -n "." +- g++ $(DEFINES) $(CFLAGS) -c $< ++ $(CXX) $(DEFINES) $(CFLAGS) -c $< +--- vdr-plugin-games-0.6.3.orig/tetris/Makefile ++++ vdr-plugin-games-0.6.3/tetris/Makefile +@@ -11,4 +11,4 @@ + + .cpp.o: + @echo -n "." +- g++ $(DEFINES) $(CFLAGS) -c $< ++ $(CXX) $(DEFINES) $(CFLAGS) -c $< +--- vdr-plugin-games-0.6.3.orig/tictactoe/Makefile ++++ vdr-plugin-games-0.6.3/tictactoe/Makefile +@@ -11,4 +11,4 @@ + + .cpp.o: + @echo -n "." +- g++ $(DEFINES) $(CFLAGS) -c $< ++ $(CXX) $(DEFINES) $(CFLAGS) -c $< +--- vdr-plugin-games-0.6.3.orig/tron/Makefile ++++ vdr-plugin-games-0.6.3/tron/Makefile +@@ -11,4 +11,4 @@ + + .cpp.o: + @echo -n "." +- g++ $(DEFINES) $(CFLAGS) -c $< ++ $(CXX) $(DEFINES) $(CFLAGS) -c $< diff --minimal -Nru vdr-plugin-games-0.6.3/debian/patches/series vdr-plugin-games-0.6.3/debian/patches/series --- vdr-plugin-games-0.6.3/debian/patches/series 2017-09-16 11:22:32.000000000 +0200 +++ vdr-plugin-games-0.6.3/debian/patches/series 2020-02-09 06:57:53.000000000 +0100 @@ -3,3 +3,4 @@ 04_gcc-4.6.patch flags.patch vdr.patch +cross.patch diff --minimal -Nru vdr-plugin-games-0.6.3/debian/rules vdr-plugin-games-0.6.3/debian/rules --- vdr-plugin-games-0.6.3/debian/rules 2015-09-22 20:55:36.000000000 +0200 +++ vdr-plugin-games-0.6.3/debian/rules 2020-02-09 06:58:33.000000000 +0100 @@ -2,10 +2,11 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +include /usr/share/dpkg/buildtools.mk MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale -CXXFLAGS += $(shell pkg-config vdr --variable=cxxflags) -CFLAGS += $(shell pkg-config vdr --variable=cflags) +CXXFLAGS += $(shell $(PKG_CONFIG) vdr --variable=cxxflags) +CFLAGS += $(shell $(PKG_CONFIG) vdr --variable=cflags) export LFLAGS=$(LDFLAGS) %:
