mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-13 18:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

xmlto: add version 0.0.25

Browse Source 
It moved from meta-oe and fixed the defect that xmlto/xsltproc
stylesheets cannot be found even when they are installed in
sysroot.

About the config files (catalog.xml), we refered what Ubuntu
13.04 did, so it could correctly search the xsl stylesheets
and xml dtds.

Assigned the environment variable XML_CATALOG_FILES, so the
xmlto will use oe-core's config as priority to avoid the
the search from build system.

[YOCTO #2416]

(From OE-Core rev: 6eccf7940e90dd06568f7a2da36ce2d5d090aed5)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Hongxu Jia
2014-07-15 20:18:06 +08:00
committed by Richard Purdie
parent 605e1f38f4
commit c95dec0b93
4 changed files with 98 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
meta/recipes-devtools/xmlto/xmlto-0.0.25/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch Normal file
View File

@@ -0,0 +1,30 @@
configure.in: drop the test of xmllint and xsltproc
The test is unnecessary, the xmllint and xsltproc were explicitly
added to RDEPENDS.
Upstream-Status: oe-specific
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
configure.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -42,10 +42,10 @@ AC_ARG_VAR([LOCALE], [Name and path of the `locale' program.])
AC_PATH_PROG([LOCALE], [locale], [locale])
AC_ARG_VAR([XMLLINT], [Name and path of the `xmllint' program.])
-AC_PATH_PROG([XMLLINT], [xmllint], [xmllint])
+dnl AC_PATH_PROG([XMLLINT], [xmllint], [xmllint])
AC_ARG_VAR([XSLTPROC], [Name and path of the `xsltproc' program.])
-AC_PATH_PROG([XSLTPROC], [xsltproc], [xsltproc])
+dnl AC_PATH_PROG([XSLTPROC], [xsltproc], [xsltproc])
dnl
dnl toolchains
--
1.8.1.2

12
meta/recipes-devtools/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch Normal file
View File

@@ -0,0 +1,12 @@
diff -Nurd xmlto-0.0.25/configure.in xmlto-0.0.25/configure.in
--- xmlto-0.0.25/configure.in 2011-12-01 17:49:00.000000000 +0200
+++ xmlto-0.0.25/configure.in 2013-01-07 05:24:16.169953519 +0200
@@ -1,7 +1,7 @@
AC_INIT(xmlto, 0.0.25)
AC_CONFIG_SRCDIR(xmlto.spec.in)
AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.6])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
AC_PROG_CC
AM_PROG_CC_C_O