Bump Buildroot Version to buildroot 2019_02_6
This commit is contained in:
@@ -0,0 +1,39 @@
|
||||
From 04b454f693d0c71336252380d08f1d02967e133e Mon Sep 17 00:00:00 2001
|
||||
From: Jean-Francois Dockes <jf@dockes.org>
|
||||
Date: Sun, 27 Jan 2019 10:44:17 +0100
|
||||
Subject: [PATCH] Do not try to detach detached thread, the result is
|
||||
undefined. Fixes issue #102
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Fixes runtime crash with musl 1.1.20+. The problem is that libupnp is
|
||||
calling pthread_detach() on a thread which was created in the detached state.
|
||||
|
||||
Backported from: 04b454f693d0c71336252380d08f1d02967e133e
|
||||
|
||||
(cherry picked from commit 386b7ed79146ecf7a3bba49f48cb8f41a9b49170)
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
---
|
||||
upnp/src/threadutil/ThreadPool.c | 5 -----
|
||||
1 file changed, 5 deletions(-)
|
||||
|
||||
diff --git a/upnp/src/threadutil/ThreadPool.c b/upnp/src/threadutil/ThreadPool.c
|
||||
index d272907..5e590ed 100644
|
||||
--- a/upnp/src/threadutil/ThreadPool.c
|
||||
+++ b/upnp/src/threadutil/ThreadPool.c
|
||||
@@ -651,11 +651,6 @@ static int CreateWorker(
|
||||
rc = ithread_create(&temp, &attr, WorkerThread, tp);
|
||||
ithread_attr_destroy(&attr);
|
||||
if (rc == 0) {
|
||||
- rc = ithread_detach(temp);
|
||||
- /* ithread_detach will return EINVAL if thread has been
|
||||
- successfully detached by ithread_create */
|
||||
- if (rc == EINVAL)
|
||||
- rc = 0;
|
||||
tp->pendingWorkerThreadStart = 1;
|
||||
/* wait until the new worker thread starts */
|
||||
while (tp->pendingWorkerThreadStart) {
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -11,12 +11,13 @@ LIBUPNP18_CONF_ENV = ac_cv_lib_compat_ftime=no
|
||||
LIBUPNP18_INSTALL_STAGING = YES
|
||||
LIBUPNP18_LICENSE = BSD-3-Clause
|
||||
LIBUPNP18_LICENSE_FILES = COPYING
|
||||
LIBUPNP18_DEPENDENCIES = host-pkgconf
|
||||
# We're patching configure.ac
|
||||
LIBUPNP18_AUTORECONF = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
LIBUPNP18_CONF_OPTS += --enable-open-ssl
|
||||
LIBUPNP18_DEPENDENCIES += host-pkgconf openssl
|
||||
LIBUPNP18_DEPENDENCIES += openssl
|
||||
else
|
||||
LIBUPNP18_CONF_OPTS += --disable-open-ssl
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user