summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorHuang Qiyu <huangqy.fnst@cn.fujitsu.com>2016-12-08 05:31:29 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-13 22:55:19 +0000
commit839d9aaafdb93db159251774a0fefe8d756fd8ce (patch)
tree618b8509a71043846e1e7387f3ec8863a8b6e5bb /meta
parentb27cda8bbe6e2042b2c1937b7542bbbf2634ef03 (diff)
downloadpoky-839d9aaafdb93db159251774a0fefe8d756fd8ce.tar.gz
slang: 2.3.0 -> 2.3.1
1)Upgrade slang from 2.3.0 to 2.3.1. 2)Delete 0001-Fix-error-conflicting-types-for-posix_close.patch, since it is integrated upstream. (From OE-Core rev: ff8865af3975fafcbe4cdf31e335a8c94c49304d) Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/slang/slang/0001-Fix-error-conflicting-types-for-posix_close.patch39
-rw-r--r--meta/recipes-extended/slang/slang_2.3.1.bb (renamed from meta/recipes-extended/slang/slang_2.3.0.bb)6
2 files changed, 3 insertions, 42 deletions
diff --git a/meta/recipes-extended/slang/slang/0001-Fix-error-conflicting-types-for-posix_close.patch b/meta/recipes-extended/slang/slang/0001-Fix-error-conflicting-types-for-posix_close.patch
deleted file mode 100644
index 57ebfe4329..0000000000
--- a/meta/recipes-extended/slang/slang/0001-Fix-error-conflicting-types-for-posix_close.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 96eb7e29822151823a66a1eb59f1fa4aead5ae08 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 31 Aug 2015 06:33:21 +0000
4Subject: [PATCH] Fix error: conflicting types for 'posix_close'
5
6Exposed while compiling on musl
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10Upstream-Status: Pending
11
12 src/slposio.c | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/src/slposio.c b/src/slposio.c
16index 9ce9697..9ff9bfe 100644
17--- a/src/slposio.c
18+++ b/src/slposio.c
19@@ -363,7 +363,7 @@ static int posix_close_fd (int *fd)
20 return 0;
21 }
22
23-static int posix_close (SLFile_FD_Type *f)
24+static int posix_closex (SLFile_FD_Type *f)
25 {
26 int status = do_close (f);
27
28@@ -1001,7 +1001,7 @@ static SLang_Intrin_Fun_Type Fd_Name_Table [] =
29 MAKE_INTRINSIC_2("write", posix_write, V, F, B),
30 MAKE_INTRINSIC_1("dup_fd", posix_dup, V, F),
31 MAKE_INTRINSIC_2("dup2_fd", posix_dup2, I, F, I),
32- MAKE_INTRINSIC_1("close", posix_close, I, F),
33+ MAKE_INTRINSIC_1("close", posix_closex, I, F),
34 MAKE_INTRINSIC_1("_close", posix_close_fd, I, I),
35 #if defined(TTYNAME_R)
36 MAKE_INTRINSIC_0("ttyname", posix_ttyname, V),
37--
382.5.1
39
diff --git a/meta/recipes-extended/slang/slang_2.3.0.bb b/meta/recipes-extended/slang/slang_2.3.1.bb
index d5967d25db..7bf3af6836 100644
--- a/meta/recipes-extended/slang/slang_2.3.0.bb
+++ b/meta/recipes-extended/slang/slang_2.3.1.bb
@@ -19,11 +19,11 @@ SRC_URI = "http://www.jedsoft.org/releases/${BPN}/${BP}.tar.bz2 \
19 file://rpathfix.patch \ 19 file://rpathfix.patch \
20 file://fix-check-pcre.patch \ 20 file://fix-check-pcre.patch \
21 file://slang-fix-the-iconv-existence-checking.patch \ 21 file://slang-fix-the-iconv-existence-checking.patch \
22 file://0001-Fix-error-conflicting-types-for-posix_close.patch \
23 file://no-x.patch \ 22 file://no-x.patch \
24 " 23 "
25SRC_URI[md5sum] = "3bcc790460d52db1316c20395b7ac2f1" 24
26SRC_URI[sha256sum] = "f95224060f45e0d8212a5039b339afa5f1a94a1bb0298e796104e5b12e926129" 25SRC_URI[md5sum] = "bd46d1dc17a50c72004ad842829d7b1f"
26SRC_URI[sha256sum] = "a810d5da7b0c0c8c335393c6b4f12884be6fa7696d9ca9521ef21316a4e00f9d"
27 27
28UPSTREAM_CHECK_URI = "http://www.jedsoft.org/releases/slang/" 28UPSTREAM_CHECK_URI = "http://www.jedsoft.org/releases/slang/"
29PREMIRRORS_append = "\n http://www.jedsoft.org/releases/slang/.* http://www.jedsoft.org/releases/slang/old/ \n" 29PREMIRRORS_append = "\n http://www.jedsoft.org/releases/slang/.* http://www.jedsoft.org/releases/slang/old/ \n"