Source: cups Version: 2.2.4-8 Tags: patch User: [email protected] Usertags: rebootstrap
Thank you for applying my patch from #837936 to make cups cross build. Unfortunately, that no longer works. When cross building cups, mantohtml fails to run again (and #837936 was meant to fix that). It turns out that man/Makefile is now duplicated to man/Makefile.l10n and it compiles its own mantohtml there with the builtin rule. Thus it ends up using the wrong compiler and wrong flags. After copying the relevant rule to man/Makefile.l10n, cups cross builds again. Please consider applying the attached patch. Helmut
diff --minimal -Nru cups-2.2.4/debian/changelog cups-2.2.4/debian/changelog --- cups-2.2.4/debian/changelog 2017-10-10 13:21:37.000000000 +0200 +++ cups-2.2.4/debian/changelog 2017-10-12 22:43:29.000000000 +0200 @@ -1,3 +1,10 @@ +cups (2.2.4-8.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTCBFS: fix manpage-translations.patch (Closes: #-1) + + -- Helmut Grohne <[email protected]> Thu, 12 Oct 2017 22:43:29 +0200 + cups (2.2.4-8) unstable; urgency=medium [ Didier Raboud ] diff --minimal -Nru cups-2.2.4/debian/patches/manpage-translations.patch cups-2.2.4/debian/patches/manpage-translations.patch --- cups-2.2.4/debian/patches/manpage-translations.patch 2017-10-10 13:08:15.000000000 +0200 +++ cups-2.2.4/debian/patches/manpage-translations.patch 2017-10-12 22:43:29.000000000 +0200 @@ -79,7 +79,7 @@ index 000000000..dca1d716b --- /dev/null +++ b/man/Makefile.l10n -@@ -0,0 +1,248 @@ +@@ -0,0 +1,251 @@ +# +# "$Id: $" +# @@ -316,6 +315,9 @@ + $(MANTOHTML) `basename $$file .$(MAN8EXT)`.man >../../doc/help/man-`basename $$file .$(MAN8EXT)`.$(LANGUAGE).html; \ + done + ++$(MANTOHTML): $(MANTOHTML).c ++ $(CC_FOR_BUILD) -o $@ $< ++ +.SUFFIXES: .man.in .man +# Keep the generated .man because they are needed for the html rule +.PRECIOUS: %.man
