summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-08-21 17:43:29 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-23 07:45:32 +0100
commitbce938174d1207685c67c40e341a36ab1158e6eb (patch)
treeb39087fddc421547e21d732d7d44df61d26e1893
parent0119335af368dffa42d9cda673e7aaafbc6f657f (diff)
downloadopenembedded-core-contrib-bce938174d1207685c67c40e341a36ab1158e6eb.tar.gz
openembedded-core-contrib-bce938174d1207685c67c40e341a36ab1158e6eb.tar.bz2
openembedded-core-contrib-bce938174d1207685c67c40e341a36ab1158e6eb.zip
gnutls: drop obsolete configure.ac patch
>From gnutls 3.5.8 onwards, the code in configure.ac has been passing "basename $i" to sed, rather than "echo $i". Since the full ${srcdir} path is not being processed, there's no risk of unexpected matches. https://gitlab.com/armcc/gnutls/commit/478179316bc815e1ad518ae318f46e94a13b0e1f Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch29
-rw-r--r--meta/recipes-support/gnutls/gnutls_3.6.3.bb1
2 files changed, 0 insertions, 30 deletions
diff --git a/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch b/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch
deleted file mode 100644
index b6e7bc9650..0000000000
--- a/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From eaab55bb6d48643163eebbc9ca575a9ca2a8e03f Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Tue, 21 Feb 2017 17:10:07 +0200
-Subject: [PATCH] configure.ac: fix sed command
-
-The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors
-when the S contains "bitbake", fix to "sed 's/\.bak$//'`"
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: gnutls-3.5.16/configure.ac
-===================================================================
---- gnutls-3.5.16.orig/configure.ac
-+++ gnutls-3.5.16/configure.ac
-@@ -955,7 +955,7 @@ YEAR=`date +%Y`
- AC_SUBST([YEAR], $YEAR)
-
- for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do
-- nam=$(basename $i|sed 's/.bak//g')
-+ nam=$(basename $i|sed 's/\.bak$//')
- if test "$create_libopts_links" = "yes";then
- rm -f "src/$nam.stamp"
- rm -f "src/$nam"
diff --git a/meta/recipes-support/gnutls/gnutls_3.6.3.bb b/meta/recipes-support/gnutls/gnutls_3.6.3.bb
index dcb211e8e0..629fcd8043 100644
--- a/meta/recipes-support/gnutls/gnutls_3.6.3.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.6.3.bb
@@ -18,7 +18,6 @@ DEPENDS_append_libc-musl = " argp-standalone"
SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \
- file://0001-configure.ac-fix-sed-command.patch \
file://arm_eabi.patch \
"