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>
This commit is contained in:
parent
b27cda8bbe
commit
839d9aaafd
|
@ -1,39 +0,0 @@
|
|||
From 96eb7e29822151823a66a1eb59f1fa4aead5ae08 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Mon, 31 Aug 2015 06:33:21 +0000
|
||||
Subject: [PATCH] Fix error: conflicting types for 'posix_close'
|
||||
|
||||
Exposed while compiling on musl
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
Upstream-Status: Pending
|
||||
|
||||
src/slposio.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/slposio.c b/src/slposio.c
|
||||
index 9ce9697..9ff9bfe 100644
|
||||
--- a/src/slposio.c
|
||||
+++ b/src/slposio.c
|
||||
@@ -363,7 +363,7 @@ static int posix_close_fd (int *fd)
|
||||
return 0;
|
||||
}
|
||||
|
||||
-static int posix_close (SLFile_FD_Type *f)
|
||||
+static int posix_closex (SLFile_FD_Type *f)
|
||||
{
|
||||
int status = do_close (f);
|
||||
|
||||
@@ -1001,7 +1001,7 @@ static SLang_Intrin_Fun_Type Fd_Name_Table [] =
|
||||
MAKE_INTRINSIC_2("write", posix_write, V, F, B),
|
||||
MAKE_INTRINSIC_1("dup_fd", posix_dup, V, F),
|
||||
MAKE_INTRINSIC_2("dup2_fd", posix_dup2, I, F, I),
|
||||
- MAKE_INTRINSIC_1("close", posix_close, I, F),
|
||||
+ MAKE_INTRINSIC_1("close", posix_closex, I, F),
|
||||
MAKE_INTRINSIC_1("_close", posix_close_fd, I, I),
|
||||
#if defined(TTYNAME_R)
|
||||
MAKE_INTRINSIC_0("ttyname", posix_ttyname, V),
|
||||
--
|
||||
2.5.1
|
||||
|
|
@ -19,11 +19,11 @@ SRC_URI = "http://www.jedsoft.org/releases/${BPN}/${BP}.tar.bz2 \
|
|||
file://rpathfix.patch \
|
||||
file://fix-check-pcre.patch \
|
||||
file://slang-fix-the-iconv-existence-checking.patch \
|
||||
file://0001-Fix-error-conflicting-types-for-posix_close.patch \
|
||||
file://no-x.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "3bcc790460d52db1316c20395b7ac2f1"
|
||||
SRC_URI[sha256sum] = "f95224060f45e0d8212a5039b339afa5f1a94a1bb0298e796104e5b12e926129"
|
||||
|
||||
SRC_URI[md5sum] = "bd46d1dc17a50c72004ad842829d7b1f"
|
||||
SRC_URI[sha256sum] = "a810d5da7b0c0c8c335393c6b4f12884be6fa7696d9ca9521ef21316a4e00f9d"
|
||||
|
||||
UPSTREAM_CHECK_URI = "http://www.jedsoft.org/releases/slang/"
|
||||
PREMIRRORS_append = "\n http://www.jedsoft.org/releases/slang/.* http://www.jedsoft.org/releases/slang/old/ \n"
|
Loading…
Reference in New Issue