summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPhil Blundell <pb@pbcl.net>2013-04-24 12:43:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-29 14:45:06 +0100
commit499bb2c6b369a021ace3059426470d3371c07fb1 (patch)
tree5e0e8908cb127a0447797900f7d0ce6833935d5f /meta
parentd853d5b6d011088ca1078283a6c7bfd60f47e7a2 (diff)
downloadpoky-499bb2c6b369a021ace3059426470d3371c07fb1.tar.gz
libxslt: Avoid regenerating manpage during "make install"
The timestamps in libxslt-1.1.28.tar.gz (specifically) are rather hokey, making the source files for the documentation appear newer than the generated output: -rw-rw-r-- 500/500 16307 2012-11-21 07:22 libxslt-1.1.28/doc/xsltproc.xml -rw-rw-r-- 500/500 7082 2012-09-12 07:24 libxslt-1.1.28/doc/xsltproc2.html -rw-rw-r-- 500/500 9475 2012-09-04 15:26 libxslt-1.1.28/doc/xsltproc.html -rw-rw-r-- 500/500 8256 2012-11-21 06:03 libxslt-1.1.28/doc/xsltproc.1 This causes make to decide that xsltproc.1 needs to be regenerated during the installation process. However, this requires a native xsltproc binary which may not be available, leading to errors like: | make[2]: /usr/bin/xsltproc: Command not found | make[2]: [xsltproc.1] Error 127 (ignored) Adding DEPENDS_class-target = "libxslt-native", or installing xsltproc in the host environment, fixes the above but the documentation still doesn't build: | I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl | warning: failed to load external entity "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" | error | xsltParseStylesheetFile : cannot parse http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl | compilation error: file ./xsltproc.xml line 10 element refentry | xsltParseStylesheetProcess : document is not a stylesheet And in any case, requiring libxslt-native would increase build time for no real benefit. So, let's just adjust the timestamp on the shipped copy of xsltproc.1 to make it appear newer than the source files. (From OE-Core rev: 12074bf5319c1086f86efd00f502c91fed344698) Signed-off-by: Phil Blundell <philb@gnu.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/libxslt/libxslt_1.1.28.bb4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-support/libxslt/libxslt_1.1.28.bb b/meta/recipes-support/libxslt/libxslt_1.1.28.bb
index 3f89e78df6..ae2e6b18b1 100644
--- a/meta/recipes-support/libxslt/libxslt_1.1.28.bb
+++ b/meta/recipes-support/libxslt/libxslt_1.1.28.bb
@@ -21,6 +21,10 @@ inherit autotools pkgconfig binconfig lib_package
21# We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header 21# We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header
22do_configure_prepend () { 22do_configure_prepend () {
23 sed -i -e 's/ansidecl.h//' ${S}/configure.in 23 sed -i -e 's/ansidecl.h//' ${S}/configure.in
24
25 # The timestamps in the 1.1.28 tarball are messed up causing this file to
26 # appear out of date. Touch it so that we don't try to regenerate it.
27 touch ${S}/doc/xsltproc.1
24} 28}
25 29
26EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto" 30EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto"