From 5b80bfd7bffd4c20d80b7c70a7130529e9a755dd Mon Sep 17 00:00:00 2001 From: ToshikazuOhiwa Date: Mon, 30 Mar 2020 09:24:26 +0900 Subject: agl-basesystem --- ...001-usage2c.awk-fix-wrong-basename-regexp.patch | 37 ++++++++++++++++++++++ .../xmlstarlet/files/configure.ac.patch | 28 ++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 external/meta-openembedded/meta-oe/recipes-support/xmlstarlet/files/0001-usage2c.awk-fix-wrong-basename-regexp.patch create mode 100644 external/meta-openembedded/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch (limited to 'external/meta-openembedded/meta-oe/recipes-support/xmlstarlet/files') diff --git a/external/meta-openembedded/meta-oe/recipes-support/xmlstarlet/files/0001-usage2c.awk-fix-wrong-basename-regexp.patch b/external/meta-openembedded/meta-oe/recipes-support/xmlstarlet/files/0001-usage2c.awk-fix-wrong-basename-regexp.patch new file mode 100644 index 00000000..24b187f2 --- /dev/null +++ b/external/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 +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 +--- + 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/external/meta-openembedded/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch b/external/meta-openembedded/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch new file mode 100644 index 00000000..e55f4f3b --- /dev/null +++ b/external/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" -- cgit 1.2.3-korg