MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-12-14 22:35:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

libupnp: Do not use _np versions of mutex APIs

Browse Source 
These APIs are deprecated/removed in future glibc 2.34+

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Khem Raj 2021-05-09 15:41:52 -07:00
parent af43242a22
commit 40622feb2e
2 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
meta-multimedia/recipes-connectivity/libupnp/libupnp/0001-ithread-Use-pthread_mutexattr_gettype-pthread_mutexa.patch Normal file
View File

@ -0,0 +1,42 @@
From 343a3b724225d3c87af0b268da14d3acb7a5b9a1 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 9 May 2021 15:38:43 -0700
Subject: [PATCH] ithread: Use
pthread_mutexattr_gettype/pthread_mutexattr_settype on linux
_np variants are not recommended anymore, and glibc 2.34+ will have
these removed
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
upnp/inc/ithread.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/upnp/inc/ithread.h b/upnp/inc/ithread.h
index f6800ea9..1d0f9dba 100644
--- a/upnp/inc/ithread.h
+++ b/upnp/inc/ithread.h
@@ -304,7 +304,8 @@ static UPNP_INLINE int ithread_cleanup_thread(void)
* Returns EINVAL if the kind is not supported.
* See man page for pthread_mutexattr_setkind_np
*****************************************************************************/
-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
+#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__) \
+ || defined (__linux__)
#define ithread_mutexattr_setkind_np pthread_mutexattr_settype
#else
#define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np
@@ -329,7 +330,8 @@ static UPNP_INLINE int ithread_cleanup_thread(void)
* Always returns 0.
* See man page for pthread_mutexattr_getkind_np
*****************************************************************************/
-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
+#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__) \
+ || defined (__linux__)
#define ithread_mutexattr_getkind_np pthread_mutexattr_gettype
#else
#define ithread_mutexattr_getkind_np pthread_mutexattr_getkind_np
--
2.31.1

8
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.14.6.bb
View File

@ -9,7 +9,9 @@ LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=394a0f17b97f33426275571e15920434"
SRCREV = "cef2b23fb36baac091b0c7d41136b4c1d9549c6d"
SRC_URI = "git://github.com/pupnp/pupnp.git;protocol=https;branch=branch-1.14.x"
SRC_URI = "git://github.com/pupnp/pupnp.git;protocol=https;branch=branch-1.14.x \
file://0001-ithread-Use-pthread_mutexattr_gettype-pthread_mutexa.patch \
"
S="${WORKDIR}/git"
@ -18,5 +20,5 @@ inherit autotools pkgconfig
EXTRA_OECONF += "--enable-reuseaddr"
# Enable LFS support ( for samples )
CFLAGS += "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
CXXFLAGS += "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
CFLAGS += "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE"
CXXFLAGS += "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE"