Source: libxslt Version: 1.1.34-3 Tags: patch User: [email protected] Usertags: ftcbfs
libxslt fails to cross built from source, because it fails running the built xsltproc. Mattia introduced the bug in -3 in order to fix a FTBFS when built twice. As it happens, the clean target removes the manual pages (which otherwise wouldn't be built!) and the second build failed to produce them. Thus Mattia made it use the built xsltproc as the /usr/bin one wasn't there. Another solution to this problem would be depending on xsltproc. That'd be a circular dependency though. For cross building, that's exactly what we have to do. Not so for native builds. So here comes a patch that makes libxslt cross build and build twice in a row. Helmut
diff --minimal -Nru libxslt-1.1.34/debian/changelog libxslt-1.1.34/debian/changelog --- libxslt-1.1.34/debian/changelog 2020-03-04 14:02:32.000000000 +0100 +++ libxslt-1.1.34/debian/changelog 2020-09-27 15:53:04.000000000 +0200 @@ -1,3 +1,11 @@ +libxslt (1.1.34-4.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTCBFS: Use the built xsltproc during native builds and the + installed one otherwise. (Closes: #-1) + + -- Helmut Grohne <[email protected]> Sun, 27 Sep 2020 15:53:04 +0200 + libxslt (1.1.34-4) unstable; urgency=medium * Team upload. diff --minimal -Nru libxslt-1.1.34/debian/clean libxslt-1.1.34/debian/clean --- libxslt-1.1.34/debian/clean 1970-01-01 01:00:00.000000000 +0100 +++ libxslt-1.1.34/debian/clean 2020-09-27 15:53:04.000000000 +0200 @@ -0,0 +1,2 @@ +doc/*.1 +NEWS diff --minimal -Nru libxslt-1.1.34/debian/control libxslt-1.1.34/debian/control --- libxslt-1.1.34/debian/control 2020-03-04 13:43:18.000000000 +0100 +++ libxslt-1.1.34/debian/control 2020-09-27 15:53:04.000000000 +0200 @@ -13,6 +13,7 @@ perl:any, pkg-config, rename, + xsltproc <cross>, Standards-Version: 4.5.0 Rules-Requires-Root: no Homepage: http://xmlsoft.org/xslt/ diff --minimal -Nru libxslt-1.1.34/debian/patches/cross.patch libxslt-1.1.34/debian/patches/cross.patch --- libxslt-1.1.34/debian/patches/cross.patch 1970-01-01 01:00:00.000000000 +0100 +++ libxslt-1.1.34/debian/patches/cross.patch 2020-09-27 15:53:04.000000000 +0200 @@ -0,0 +1,25 @@ +--- libxslt-1.1.34.orig/doc/Makefile.am ++++ libxslt-1.1.34/doc/Makefile.am +@@ -239,9 +239,9 @@ + ($(XSLTPROC) -o ../libxslt/libxslt.syms $(srcdir)/syms.xsl $(srcdir)/symbols.xml) + + xsltproc.1: $(srcdir)/xsltproc.xml +- (if [ -x $(srcdir)/../xsltproc/xsltproc ] && [ -f /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl ] ; then \ ++ (if [ -x $(XSLTPROC) ] && [ -f /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl ] ; then \ + echo "Rebuilding the man pages from the xml" ; \ +- $(srcdir)/../xsltproc/xsltproc --nonet /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl $(srcdir)/xsltproc.xml ; fi) ++ $(XSLTPROC) --nonet /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl $(srcdir)/xsltproc.xml ; fi) + + # Note that in the following, xmllint output is piped to xsltproc + search.php: $(srcdir)/api.xsl $(srcdir)/site.xsl $(srcdir)/search.templ \ +--- libxslt-1.1.34.orig/configure.ac ++++ libxslt-1.1.34/configure.ac +@@ -117,7 +117,7 @@ + AC_PROG_INSTALL + AC_PROG_CPP + AC_PATH_PROG(XMLLINT, xmllint, /usr/bin/xmllint) +-AC_PATH_PROG(XSLTPROC, xsltproc, /usr/bin/xsltproc) ++AC_PATH_PROG(XSLTPROC, xsltproc, \${top_srcdir}/xsltproc/xsltproc) + PKG_PROG_PKG_CONFIG + + AC_HEADER_STDC diff --minimal -Nru libxslt-1.1.34/debian/patches/series libxslt-1.1.34/debian/patches/series --- libxslt-1.1.34/debian/patches/series 2020-03-04 14:02:32.000000000 +0100 +++ libxslt-1.1.34/debian/patches/series 2020-09-27 15:52:20.000000000 +0200 @@ -3,3 +3,4 @@ 0003-remove-plugin-in-xslt-config.patch 0004-do-not-clean-manpage.patch 0005-Drop-libdir-and-static-linking-information-from-xslt.patch +cross.patch
