mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-02 01:50:18 +00:00
jq: update to 1.6
Drop backported patch as it's present in 1.6. Switch to autotools-brokensep to avoid | sed -e 's/\\/\\\\/g' -e 's/"/\\"/g' -e 's/^/"/' -e 's/$/\\n"/' ../jq-1.6/src/builtin.jq > src/builtin.inc | /bin/sh: src/builtin.inc: No such file or directory License-Update: whitespace changes Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -1,68 +0,0 @@
|
|||||||
From 18b4b18b41f5ed396d73449ce8d6ec408d95d6b2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Tolnay <dtolnay@gmail.com>
|
|
||||||
Date: Sat, 21 Nov 2015 10:05:37 -0800
|
|
||||||
Subject: [PATCH] Support --without-oniguruma
|
|
||||||
|
|
||||||
Upstream-Status: Backport
|
|
||||||
|
|
||||||
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
|
|
||||||
|
|
||||||
---
|
|
||||||
configure.ac | 41 ++++++++++++++++++++---------------------
|
|
||||||
1 file changed, 20 insertions(+), 21 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 9e2c8cf..7f6be34 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -52,27 +52,26 @@ fi
|
|
||||||
AC_ARG_WITH([oniguruma],
|
|
||||||
[AS_HELP_STRING([--with-oniguruma=prefix],
|
|
||||||
[try this for a non-standard install prefix of the oniguruma library])],
|
|
||||||
- [ONIGURUMAPATHSET=1],
|
|
||||||
- [ONIGURUMAPATHSET=0])
|
|
||||||
-
|
|
||||||
-if test $ONIGURUMAPATHSET = 1; then
|
|
||||||
- CFLAGS="$CFLAGS -I${with_oniguruma}/include"
|
|
||||||
- LDFLAGS="$LDFLAGS -L${with_oniguruma}/lib"
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-# check for ONIGURUMA library
|
|
||||||
-HAVE_ONIGURUMA=0
|
|
||||||
-AC_CHECK_HEADER("oniguruma.h",
|
|
||||||
- AC_CHECK_LIB([onig],[onig_version],[LIBS="$LIBS -lonig"; HAVE_ONIGURUMA=1;]))
|
|
||||||
-
|
|
||||||
-# handle check results
|
|
||||||
-if test $HAVE_ONIGURUMA != 1; then
|
|
||||||
- AC_MSG_NOTICE([Oniguruma was not found.])
|
|
||||||
- AC_MSG_NOTICE([ Try setting the location using '--with-oniguruma=PREFIX' ])
|
|
||||||
-else
|
|
||||||
- AC_DEFINE([HAVE_ONIGURUMA],1,[Define to 1 if Oniguruma is installed])
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
+ [],
|
|
||||||
+ [with_oniguruma=yes])
|
|
||||||
+
|
|
||||||
+AS_IF([test "x$with_oniguruma" != xno], [
|
|
||||||
+ AS_IF([test "x$with_oniguruma" != xyes], [
|
|
||||||
+ CFLAGS="$CFLAGS -I${with_oniguruma}/include"
|
|
||||||
+ LDFLAGS="$LDFLAGS -L${with_oniguruma}/lib"
|
|
||||||
+ ])
|
|
||||||
+ # check for ONIGURUMA library
|
|
||||||
+ have_oniguruma=0
|
|
||||||
+ AC_CHECK_HEADER("oniguruma.h",
|
|
||||||
+ AC_CHECK_LIB([onig],[onig_version],[LIBS="$LIBS -lonig"; have_oniguruma=1;]))
|
|
||||||
+ # handle check results
|
|
||||||
+ AS_IF([test $have_oniguruma = 1], [
|
|
||||||
+ AC_DEFINE([HAVE_ONIGURUMA], 1, [Define to 1 if Oniguruma is installed])
|
|
||||||
+ ], [
|
|
||||||
+ AC_MSG_NOTICE([Oniguruma was not found.])
|
|
||||||
+ AC_MSG_NOTICE([Try setting the location using '--with-oniguruma=PREFIX'])
|
|
||||||
+ ])
|
|
||||||
+])
|
|
||||||
|
|
||||||
dnl Check for valgrind
|
|
||||||
AC_CHECK_PROGS(valgrind_cmd, valgrind)
|
|
||||||
--
|
|
||||||
1.9.1
|
|
||||||
|
|
||||||
@@ -6,16 +6,15 @@ HOMEPAGE = "https://stedolan.github.io/jq/"
|
|||||||
BUGTRACKER = "https://github.com/stedolan/jq/issues"
|
BUGTRACKER = "https://github.com/stedolan/jq/issues"
|
||||||
SECTION = "utils"
|
SECTION = "utils"
|
||||||
LICENSE = "MIT"
|
LICENSE = "MIT"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=29dd0c35d7e391bb8d515eacf7592e00"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=15d03e360fa7399f76d5a4359fc72cbf"
|
||||||
|
|
||||||
SRC_URI = "https://github.com/stedolan/${BPN}/releases/download/${BP}/${BP}.tar.gz \
|
SRC_URI = "https://github.com/stedolan/${BPN}/releases/download/${BP}/${BP}.tar.gz \
|
||||||
file://Support-without-oniguruma.patch \
|
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "0933532b086bd8b6a41c1b162b1731f9"
|
SRC_URI[md5sum] = "e68fbd6a992e36f1ac48c99bbf825d6b"
|
||||||
SRC_URI[sha256sum] = "c4d2bfec6436341113419debf479d833692cc5cdab7eb0326b5a4d4fbe9f493c"
|
SRC_URI[sha256sum] = "5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72"
|
||||||
|
|
||||||
inherit autotools
|
inherit autotools-brokensep
|
||||||
|
|
||||||
PACKAGECONFIG ?= "oniguruma"
|
PACKAGECONFIG ?= "oniguruma"
|
||||||
|
|
||||||
Reference in New Issue
Block a user