summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-08-31 06:37:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-12 22:48:37 +0100
commit27a850ab08043c99681098183173e8f71e3d737d (patch)
treed5e76e94353e9899602e01c43a57c623b7f06364 /meta
parent5ee0383697a1601b225e9df9bb4e532ba427aa1b (diff)
downloadpoky-27a850ab08043c99681098183173e8f71e3d737d.tar.gz
slang: Fix namespace conflict vis-a-vis posix_close
Fixes errors like | /home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/core2-64-oe-linux-musl/slang/2.2.4-r12/slang-2.2.4/src/slpo sio.c:366:12: error: conflicting types for 'posix_close' | static int posix_close (SLFile_FD_Type *f) | ^ | In file included from /home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/core2-64-oe-linux-musl/slang/2.2.4-r1 2/slang-2.2.4/src/slinclud.h:20:0, | from /home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/core2-64-oe-linux-musl/slang/2.2.4-r1 2/slang-2.2.4/src/slposio.c:24: | /home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86-64/usr/include/unistd.h:38:5: note: previous de claration of 'posix_close' was here | int posix_close(int, int); | ^ | make[1]: *** [/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/core2-64-oe-linux-musl/slang/2.2.4-r12/slang- 2.2.4/src/elfobjs/slposio.o] Error 1 (From OE-Core rev: 6b0cebe506b73cee7591089b624b69e009100c89) Signed-off-by: Khem Raj <raj.khem@gmail.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.2.4.bb1
2 files changed, 40 insertions, 0 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
new file mode 100644
index 0000000000..57ebfe4329
--- /dev/null
+++ b/meta/recipes-extended/slang/slang/0001-Fix-error-conflicting-types-for-posix_close.patch
@@ -0,0 +1,39 @@
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.2.4.bb b/meta/recipes-extended/slang/slang_2.2.4.bb
index 25f1b0c08d..5122f53da3 100644
--- a/meta/recipes-extended/slang/slang_2.2.4.bb
+++ b/meta/recipes-extended/slang/slang_2.2.4.bb
@@ -22,6 +22,7 @@ SRC_URI = "ftp://space.mit.edu/pub/davis/slang/v2.2/slang-${PV}.tar.bz2 \
22 file://change-char-type-to-signed-char-in-macros.patch \ 22 file://change-char-type-to-signed-char-in-macros.patch \
23 file://sprintf-bug-concerning-8-bit-characters.patch \ 23 file://sprintf-bug-concerning-8-bit-characters.patch \
24 file://slang-fix-the-iconv-existence-checking.patch \ 24 file://slang-fix-the-iconv-existence-checking.patch \
25 file://0001-Fix-error-conflicting-types-for-posix_close.patch \
25 " 26 "
26 27
27inherit autotools-brokensep 28inherit autotools-brokensep