diff -Nru speech-tools-2.1~release/debian/changelog speech-tools-2.1~release/debian/changelog --- speech-tools-2.1~release/debian/changelog 2014-04-20 00:44:41.000000000 +0000 +++ speech-tools-2.1~release/debian/changelog 2014-05-21 14:59:20.000000000 +0000 @@ -1,3 +1,9 @@ +speech-tools (1:2.1~release-7+rpi1) jessie-staging; urgency=medium + + * Build with gcc/g++ 4.9 to avoid ICE + + -- Peter Michael Green Wed, 21 May 2014 14:59:06 +0000 + speech-tools (1:2.1~release-7) unstable; urgency=low [ Samuel Thibault ] diff -Nru speech-tools-2.1~release/debian/control speech-tools-2.1~release/debian/control --- speech-tools-2.1~release/debian/control 2014-04-19 19:49:51.000000000 +0000 +++ speech-tools-2.1~release/debian/control 2014-05-21 14:59:48.000000000 +0000 @@ -15,7 +15,8 @@ doxygen, doxygen-latex, graphviz, - hardening-wrapper + hardening-wrapper, + gcc-4.9, g++-4.9 Standards-Version: 3.9.5 Homepage: http://festvox.org/packed/festival/ Vcs-Git: git://git.debian.org/git/tts/speech-tools.git diff -Nru speech-tools-2.1~release/debian/rules speech-tools-2.1~release/debian/rules --- speech-tools-2.1~release/debian/rules 2014-04-19 23:07:20.000000000 +0000 +++ speech-tools-2.1~release/debian/rules 2014-05-21 22:40:42.000000000 +0000 @@ -26,7 +26,13 @@ S_SCRIPTS = raw_to_xgraph.prl make_wagon_desc.sh resynth.sh +# the clean way of forcing a compiler doesn't work so we do it the dirty way +export PATH:=$(CURDIR)/gcclinks:$(PATH) + override_dh_auto_configure: + mkdir gcclinks + ln -s /usr/bin/gcc-4.9 gcclinks/gcc + ln -s /usr/bin/g++-4.9 gcclinks/g++ ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif @@ -49,7 +55,6 @@ override_dh_auto_clean: override_dh_auto_configure $(MAKE) clean NO_DEPEND=1 SYSTEM_TYPE=unknown_DebianGNULinux - override_dh_clean: find -name make.depend -print0 | xargs -0r $(RM) find -name make.include -print0 | xargs -0r $(RM) @@ -62,6 +67,7 @@ $(RM) -rf doc/doxygen doc/man/*.dox dh_clean $(RM) config/config + rm -rf gcclinks override_dh_auto_install: dh_install -p libestools$(MAJORVER) lib/*.so.$(FULLVER) /usr/lib/$(DEB_HOST_MULTIARCH)