CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

wvstreams: Fix build with musl

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
(cherry picked from commit 68b2dec5d4)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Khem Raj 2017-07-22 09:50:45 -07:00 committed by Armin Kuster
parent 250c476605
commit a1e9dfd390
7 changed files with 291 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
meta-oe/recipes-connectivity/wvdial/wvstreams/0001-Check-for-limits.h-during-configure.patch Normal file
View File

@ -0,0 +1,26 @@
From 7deaf836d1f1b9e4426818584b4267f8c4a095aa Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 20 Jul 2017 21:04:07 -0700
Subject: [PATCH 1/5] Check for limits.h during configure
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
configure.ac | 2 ++
1 file changed, 2 insertions(+)
diff --git a/configure.ac b/configure.ac
index fe0fa2b..188adfe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,6 +139,8 @@ int main()
[Compiler warning on deprecated functions])])
CPPFLAGS="$CPPFLAGS_save"
+AC_CHECK_HEADERS(limits.h)
+
# argp
USE_WVSTREAMS_ARGP=0
AC_CHECK_HEADERS(argp.h)
--
2.13.3

135
meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch Normal file
View File

@ -0,0 +1,135 @@
From 0e054339c1422168a7f4a9dcf090268053a33b1f Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 20 Jul 2017 21:05:37 -0700
Subject: [PATCH 2/5] wvtask: Dont use ucontext on non-glibc systems
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
utils/wvtask.cc | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/utils/wvtask.cc b/utils/wvtask.cc
index cdcd544..c0bff7d 100644
--- a/utils/wvtask.cc
+++ b/utils/wvtask.cc
@@ -199,7 +199,9 @@ WvTaskMan::WvTaskMan()
stacktop = (char *)alloca(0);
context_return = 0;
+#ifdef __GLIBC__
assert(getcontext(&get_stack_return) == 0);
+#endif
if (context_return == 0)
{
// initial setup - start the stackmaster() task (never returns!)
@@ -265,13 +267,17 @@ int WvTaskMan::run(WvTask &task, int val)
state = &old_task->mystate;
context_return = 0;
+#ifdef __GLIBC__
assert(getcontext(state) == 0);
+#endif
int newval = context_return;
if (newval == 0)
{
// saved the state, now run the task.
context_return = val;
+#ifdef __GLIBC__
setcontext(&task.mystate);
+#endif
return -1;
}
else
@@ -319,13 +325,17 @@ int WvTaskMan::yield(int val)
#endif
context_return = 0;
+#ifdef __GLIBC__
assert(getcontext(&current_task->mystate) == 0);
+#endif
int newval = context_return;
if (newval == 0)
{
// saved the task state; now yield to the toplevel.
context_return = val;
+#ifdef __GLIBC__
setcontext(&toplevel);
+#endif
return -1;
}
else
@@ -341,7 +351,9 @@ int WvTaskMan::yield(int val)
void WvTaskMan::get_stack(WvTask &task, size_t size)
{
context_return = 0;
+#ifdef __GLIBC__
assert(getcontext(&get_stack_return) == 0);
+#endif
if (context_return == 0)
{
assert(magic_number == -WVTASK_MAGIC);
@@ -371,7 +383,9 @@ void WvTaskMan::get_stack(WvTask &task, size_t size)
// initial setup
stack_target = &task;
context_return = size/1024 + (size%1024 > 0);
+#ifdef __GLIBC__
setcontext(&stackmaster_task);
+#endif
}
else
{
@@ -409,7 +423,9 @@ void WvTaskMan::_stackmaster()
assert(magic_number == -WVTASK_MAGIC);
context_return = 0;
+#ifdef __GLIBC__
assert(getcontext(&stackmaster_task) == 0);
+#endif
val = context_return;
if (val == 0)
{
@@ -419,7 +435,9 @@ void WvTaskMan::_stackmaster()
// all current stack allocations) and go back to get_stack
// (or the constructor, if that's what called us)
context_return = 1;
+#ifdef __GLIBC__
setcontext(&get_stack_return);
+#endif
}
else
{
@@ -474,7 +492,9 @@ void WvTaskMan::do_task()
// back here from longjmp; someone wants stack space.
context_return = 0;
+#ifdef __GLIBC__
assert(getcontext(&task->mystate) == 0);
+#endif
if (context_return == 0)
{
// done the setjmp; that means the target task now has
@@ -510,7 +530,9 @@ void WvTaskMan::do_task()
}
else
{
+#ifdef __GLIBC__
assert(getcontext(&task->func_call) == 0);
+#endif
task->func_call.uc_stack.ss_size = task->stacksize;
task->func_call.uc_stack.ss_sp = task->stack;
task->func_call.uc_stack.ss_flags = 0;
@@ -521,9 +543,11 @@ void WvTaskMan::do_task()
(void (*)(void))call_func, 1, task);
context_return = 0;
+#ifdef __GLIBC__
assert(getcontext(&task->func_return) == 0);
if (context_return == 0)
setcontext(&task->func_call);
+#endif
}
// the task's function terminated.
--
2.13.3

27
meta-oe/recipes-connectivity/wvdial/wvstreams/0003-wvtask-Check-for-HAVE_LIBC_STACK_END-only-on-glibc-s.patch Normal file
View File

@ -0,0 +1,27 @@
From f1fc9f4d523dd8b773a4535176547b0619ec05c6 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 20 Jul 2017 21:08:57 -0700
Subject: [PATCH 3/5] wvtask: Check for HAVE_LIBC_STACK_END only on glibc
systems
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
utils/wvtask.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/wvtask.cc b/utils/wvtask.cc
index c0bff7d..716344b 100644
--- a/utils/wvtask.cc
+++ b/utils/wvtask.cc
@@ -563,7 +563,7 @@ void WvTaskMan::do_task()
const void *WvTaskMan::current_top_of_stack()
{
-#ifdef HAVE_LIBC_STACK_END
+#if defined(HAVE_LIBC_STACK_END) && defined(__GLIBC__)
extern const void *__libc_stack_end;
if (use_shared_stack() || current_task == NULL)
return __libc_stack_end;
--
2.13.3

28
meta-oe/recipes-connectivity/wvdial/wvstreams/0004-wvcrash-Replace-use-of-basename-API.patch Normal file
View File

@ -0,0 +1,28 @@
From bfe68126693f9159f7ac66a69217e0b5f43e5781 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 20 Jul 2017 21:11:21 -0700
Subject: [PATCH 4/5] wvcrash: Replace use of basename API
musl does not have this API
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
utils/wvcrash.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/wvcrash.cc b/utils/wvcrash.cc
index 0417759..3d160b7 100644
--- a/utils/wvcrash.cc
+++ b/utils/wvcrash.cc
@@ -404,7 +404,7 @@ extern void __wvcrash_init_buffers(const char *program_name);
void wvcrash_setup(const char *_argv0, const char *_desc)
{
if (_argv0)
- argv0 = basename(_argv0);
+ argv0 = strrchr(_argv0, '/') ? strrchr(_argv0, '/')+1 : _argv0;
__wvcrash_init_buffers(argv0);
if (_desc)
{
--
2.13.3

30
meta-oe/recipes-connectivity/wvdial/wvstreams/0005-check-for-libexecinfo-during-configure.patch Normal file
View File

@ -0,0 +1,30 @@
From fd9515f08dcdafea6ae03413fbe5a43a6438fe3e Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 20 Jul 2017 21:25:48 -0700
Subject: [PATCH 5/5] check for libexecinfo during configure
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
configure.ac | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/configure.ac b/configure.ac
index 188adfe..1ab4d3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,6 +159,12 @@ AC_SEARCH_LIBS([argp_parse], [argp c], [], [
USE_WVSTREAMS_ARGP=1
fi
])
+
+USE_LIBEXECINFO=0
+AC_SEARCH_LIBS([backtrace], [execinfo], [], [
+USE_LIBEXECINFO=1
+])
+
# Function checks
AC_HEADER_DIRENT
--
2.13.3

37
meta-oe/recipes-connectivity/wvdial/wvstreams/argp.patch Normal file
View File

@ -0,0 +1,37 @@
Check for argp_parse in libargp and then in libc before using internal version
Index: wvstreams-4.6.1/configure.ac
===================================================================
--- wvstreams-4.6.1.orig/configure.ac
+++ wvstreams-4.6.1/configure.ac
@@ -142,20 +142,21 @@ CPPFLAGS="$CPPFLAGS_save"
# argp
USE_WVSTREAMS_ARGP=0
AC_CHECK_HEADERS(argp.h)
-AC_CHECK_FUNC(argp_parse)
-if test "$ac_cv_func_argp_parse" != yes \
- -o "$ac_cv_header_argp_h" != yes ; then
- (
- echo
+AC_SEARCH_LIBS([argp_parse], [argp c], [], [
+
+ if test "$ac_cv_func_argp_parse" != yes \
+ -o "$ac_cv_header_argp_h" != yes ; then
+ (
+ echo
echo 'configuring argp...'
cd argp
./configure --host=$host_cpu-$host_os || exit $?
echo 'argp configured.'
echo
- ) || exit $?
- USE_WVSTREAMS_ARGP=1
-fi
-
+ ) || exit $?
+ USE_WVSTREAMS_ARGP=1
+ fi
+])
# Function checks
AC_HEADER_DIRENT

9
meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
View File

@ -5,6 +5,7 @@ LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=55ca817ccb7d5b5b66355690e9abc605"
DEPENDS = "zlib openssl (>= 0.9.8) dbus readline"
DEPENDS_append_libc-musl = " argp-standalone libexecinfo"
SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz \
file://04_signed_request.diff \
@ -12,7 +13,13 @@ SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz \
file://06_gcc-4.7.diff \
file://07_buildflags.diff \
file://gcc-6.patch \
"
file://argp.patch \
file://0001-Check-for-limits.h-during-configure.patch \
file://0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch \
file://0003-wvtask-Check-for-HAVE_LIBC_STACK_END-only-on-glibc-s.patch \
file://0004-wvcrash-Replace-use-of-basename-API.patch \
file://0005-check-for-libexecinfo-during-configure.patch \
"
SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c"
SRC_URI[sha256sum] = "8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633"