diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2017-04-24 16:29:54 +0200 |
---|---|---|
committer | Ross Burton <ross.burton@intel.com> | 2017-04-25 12:18:32 +0100 |
commit | fc0e3eae0f0669e6780ed69680cd065a77baca24 (patch) | |
tree | 036e53a96b3e7bcdd4543d413d4cd64ddff5eece /recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch | |
parent | de001bd6bfcec943d274b649c62be6848cc9c3e6 (diff) | |
download | meta-gplv2-fc0e3eae0f0669e6780ed69680cd065a77baca24.tar.gz |
gnutls: add older gnutls compatible with nettle
* gnutls depends on nettle-3.1* since 3.4.0:
The requirement for nettle was bumped from 3.0 to 3.1 in gnutls_3_4_0
https://gitlab.com/gnutls/gnutls/commit/c84129af91b21d33ffe086e507632771b0e76498
and from 2.7 to 3.0 a bit earlier also in gnutls_3_4_0
https://gitlab.com/gnutls/gnutls/commit/3fa80cf68919f07b3351b2722278ba463d6e731c
* add recipe for last release in 3.3 branch which is compatible
with nettle 2.7.1 used in meta-gplv2
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch')
-rw-r--r-- | recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch b/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch new file mode 100644 index 0000000..44a9934 --- /dev/null +++ b/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Sat, 17 Jan 2015 17:02:15 +0000 | ||
4 | Subject: [PATCH] configure.ac: fix sed command | ||
5 | |||
6 | The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors | ||
7 | when the S contains "bitbake", fix to "sed 's/\.bak$//'`" | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
12 | --- | ||
13 | configure.ac | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index c6818a0..1c4582d 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then | ||
21 | dnl replace libopts-generated files with distributed backups, if present | ||
22 | missing_baks= | ||
23 | for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do | ||
24 | - nam=`echo $i|sed 's/.bak//g'` | ||
25 | + nam=`echo $i|sed 's/\.bak$//'` | ||
26 | if test -f $i;then | ||
27 | cp -f $i $nam | ||
28 | else | ||
29 | -- | ||
30 | 2.0.1 | ||
31 | |||