diff options
Diffstat (limited to 'meta-oe/recipes-support/xmlstarlet')
3 files changed, 91 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/xmlstarlet/files/0001-usage2c.awk-fix-wrong-basename-regexp.patch b/meta-oe/recipes-support/xmlstarlet/files/0001-usage2c.awk-fix-wrong-basename-regexp.patch new file mode 100644 index 000000000..24b187f2a --- /dev/null +++ b/meta-oe/recipes-support/xmlstarlet/files/0001-usage2c.awk-fix-wrong-basename-regexp.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | Upstream-Status: Submitted [sourceforge] | ||
2 | |||
3 | From 75d789d0ea9716c9a9ae72f42a2fcfa907cf4a12 Mon Sep 17 00:00:00 2001 | ||
4 | From: Matthieu Crapet <mcrapet@gmail.com> | ||
5 | Date: Mon, 30 Jun 2014 13:52:25 +0200 | ||
6 | Subject: [PATCH] usage2c.awk: fix wrong basename regexp | ||
7 | |||
8 | Previously not matching with filename argument with absolute path. | ||
9 | |||
10 | Signed-off-by: Matthieu Crapet <mcrapet@gmail.com> | ||
11 | --- | ||
12 | usage2c.awk | 4 ++-- | ||
13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/usage2c.awk b/usage2c.awk | ||
16 | index 94b897a..9aea212 100755 | ||
17 | --- a/usage2c.awk | ||
18 | +++ b/usage2c.awk | ||
19 | @@ -6,13 +6,13 @@ BEGIN { | ||
20 | } | ||
21 | |||
22 | # text in src/foo-bar.txt results in | ||
23 | -# static const char foo_text[] = { | ||
24 | +# static const char foo_bar[] = { | ||
25 | # 't', 'h', 'e', ' ', 't', 'e', 'x', 't', ... | ||
26 | # } | ||
27 | length(command_name) == 0 { | ||
28 | command_name = FILENAME; | ||
29 | sub(/\.txt$/, "", command_name); | ||
30 | - sub(/^([^\/]+\/)*/, "", command_name); | ||
31 | + sub(/^.*\//, "", command_name); | ||
32 | gsub(/-/, "_", command_name); | ||
33 | printf("static const char %s[] = {\n", command_name); | ||
34 | progs = 0; | ||
35 | -- | ||
36 | 2.0.0 | ||
37 | |||
diff --git a/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch b/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch new file mode 100644 index 000000000..e55f4f3b1 --- /dev/null +++ b/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | configure.ac: don't use xml-config if --with-libxml-prefix is specified to configure | ||
2 | |||
3 | Same behavior for xslt-config. | ||
4 | |||
5 | diff --git a/configure.ac b/configure.ac | ||
6 | index ed04e0c..39d5d4c 100644 | ||
7 | --- a/configure.ac | ||
8 | +++ b/configure.ac | ||
9 | @@ -40,7 +40,8 @@ AC_ARG_PROGRAM dnl Transforming Program Names When Installing | ||
10 | AC_PROG_SED | ||
11 | AC_PROG_AWK | ||
12 | |||
13 | -XSTAR_LIB_CHECK([LIBXML], [xml2-config]) | ||
14 | +AS_IF([test "x$LIBXML_PREFIX" = x], | ||
15 | + [XSTAR_LIB_CHECK([LIBXML], [xml2-config])]) | ||
16 | |||
17 | AS_IF([test "x$LIBXML_SRCDIR" != x], | ||
18 | [LIBXML_INCDIR="$LIBXML_SRCDIR/include"]) | ||
19 | @@ -56,7 +57,8 @@ AS_IF([test "x$STATIC_LIBS" != xno], | ||
20 | [LIBXML_LDFLAGS="-L$LIBXML_LIBDIR"] | ||
21 | |||
22 | |||
23 | -XSTAR_LIB_CHECK([LIBXSLT], [xslt-config]) | ||
24 | +AS_IF([test "x$LIBXSLT_PREFIX" = x], | ||
25 | + [XSTAR_LIB_CHECK([LIBXSLT], [xslt-config])]) | ||
26 | |||
27 | AS_IF([test "x$LIBXSLT_SRCDIR" != x], | ||
28 | [XSLTPROC_PATH="$LIBXSLT_SRCDIR/xsltproc:$PATH" | ||
diff --git a/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.5.0.bb b/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.5.0.bb new file mode 100644 index 000000000..d9a03c6d4 --- /dev/null +++ b/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.5.0.bb | |||
@@ -0,0 +1,26 @@ | |||
1 | SUMMARY = "Command line XML toolkit" | ||
2 | DESCRIPTION = "XMLStarlet is a command line XML toolkit which can be used to \ | ||
3 | transform, query, validate, and edit XML documents and files \ | ||
4 | using simple set of shell commands in similar way it is done \ | ||
5 | for plain text files using grep/sed/awk/tr/diff/patch." | ||
6 | HOMEPAGE = "http://xmlstar.sourceforge.net/" | ||
7 | BUGTRACKER = "http://xmlstar.sourceforge.net/bugs/" | ||
8 | |||
9 | SECTION = "console/utils" | ||
10 | LICENSE = "MIT" | ||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=c04760d09e8b0fe73283d0cc9e8bea53" | ||
12 | |||
13 | DEPENDS = "libxml2 libxslt" | ||
14 | |||
15 | SRC_URI = "${SOURCEFORGE_MIRROR}/xmlstar/${BP}.tar.gz \ | ||
16 | file://configure.ac.patch \ | ||
17 | file://0001-usage2c.awk-fix-wrong-basename-regexp.patch" | ||
18 | SRC_URI[md5sum] = "0c6db295d0cf9ff0d439edb755b7e8f6" | ||
19 | SRC_URI[sha256sum] = "47b4ed042ea2909257f2a386001af49fceb303f84da7214779ccf99fffc6bbba" | ||
20 | |||
21 | inherit autotools | ||
22 | |||
23 | # doc build: requires (native) xstlproc, fop, pdf2ps | ||
24 | EXTRA_OECONF="--disable-build-docs \ | ||
25 | --with-libxml-prefix=${STAGING_LIBDIR}/.. \ | ||
26 | --with-libxslt-prefix=${STAGING_LIBDIR}/.." | ||