diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-openembedded/meta-oe/recipes-support/xmlstarlet | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/xmlstarlet')
3 files changed, 91 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/xmlstarlet/files/0001-usage2c.awk-fix-wrong-basename-regexp.patch b/meta-openembedded/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-openembedded/meta-oe/recipes-support/xmlstarlet/files/0001-usage2c.awk-fix-wrong-basename-regexp.patch @@ -0,0 +1,37 @@ +Upstream-Status: Submitted [sourceforge] + +From 75d789d0ea9716c9a9ae72f42a2fcfa907cf4a12 Mon Sep 17 00:00:00 2001 +From: Matthieu Crapet <mcrapet@gmail.com> +Date: Mon, 30 Jun 2014 13:52:25 +0200 +Subject: [PATCH] usage2c.awk: fix wrong basename regexp + +Previously not matching with filename argument with absolute path. + +Signed-off-by: Matthieu Crapet <mcrapet@gmail.com> +--- + usage2c.awk | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/usage2c.awk b/usage2c.awk +index 94b897a..9aea212 100755 +--- a/usage2c.awk ++++ b/usage2c.awk +@@ -6,13 +6,13 @@ BEGIN { + } + + # text in src/foo-bar.txt results in +-# static const char foo_text[] = { ++# static const char foo_bar[] = { + # 't', 'h', 'e', ' ', 't', 'e', 'x', 't', ... + # } + length(command_name) == 0 { + command_name = FILENAME; + sub(/\.txt$/, "", command_name); +- sub(/^([^\/]+\/)*/, "", command_name); ++ sub(/^.*\//, "", command_name); + gsub(/-/, "_", command_name); + printf("static const char %s[] = {\n", command_name); + progs = 0; +-- +2.0.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch b/meta-openembedded/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch new file mode 100644 index 000000000..e55f4f3b1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch @@ -0,0 +1,28 @@ +configure.ac: don't use xml-config if --with-libxml-prefix is specified to configure + +Same behavior for xslt-config. + +diff --git a/configure.ac b/configure.ac +index ed04e0c..39d5d4c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -40,7 +40,8 @@ AC_ARG_PROGRAM dnl Transforming Program Names When Installing + AC_PROG_SED + AC_PROG_AWK + +-XSTAR_LIB_CHECK([LIBXML], [xml2-config]) ++AS_IF([test "x$LIBXML_PREFIX" = x], ++ [XSTAR_LIB_CHECK([LIBXML], [xml2-config])]) + + AS_IF([test "x$LIBXML_SRCDIR" != x], + [LIBXML_INCDIR="$LIBXML_SRCDIR/include"]) +@@ -56,7 +57,8 @@ AS_IF([test "x$STATIC_LIBS" != xno], + [LIBXML_LDFLAGS="-L$LIBXML_LIBDIR"] + + +-XSTAR_LIB_CHECK([LIBXSLT], [xslt-config]) ++AS_IF([test "x$LIBXSLT_PREFIX" = x], ++ [XSTAR_LIB_CHECK([LIBXSLT], [xslt-config])]) + + AS_IF([test "x$LIBXSLT_SRCDIR" != x], + [XSLTPROC_PATH="$LIBXSLT_SRCDIR/xsltproc:$PATH" diff --git a/meta-openembedded/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb b/meta-openembedded/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb new file mode 100644 index 000000000..e3d52e616 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb @@ -0,0 +1,26 @@ +SUMMARY = "Command line XML toolkit" +DESCRIPTION = "XMLStarlet is a command line XML toolkit which can be used to \ + transform, query, validate, and edit XML documents and files \ + using simple set of shell commands in similar way it is done \ + for plain text files using grep/sed/awk/tr/diff/patch." +HOMEPAGE = "http://xmlstar.sourceforge.net/" +BUGTRACKER = "http://xmlstar.sourceforge.net/bugs/" + +SECTION = "console/utils" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=c04760d09e8b0fe73283d0cc9e8bea53" + +DEPENDS = "libxml2 libxslt" + +SRC_URI = "${SOURCEFORGE_MIRROR}/xmlstar/${BP}.tar.gz \ + file://configure.ac.patch \ + file://0001-usage2c.awk-fix-wrong-basename-regexp.patch" +SRC_URI[md5sum] = "f3c5dfa3b1a2ee06cd57c255cc8b70a0" +SRC_URI[sha256sum] = "15d838c4f3375332fd95554619179b69e4ec91418a3a5296e7c631b7ed19e7ca" + +inherit autotools + +# doc build: requires (native) xstlproc, fop, pdf2ps +EXTRA_OECONF="--disable-build-docs \ + --with-libxml-prefix=${STAGING_LIBDIR}/.. \ + --with-libxslt-prefix=${STAGING_LIBDIR}/.." |