mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/liburcu: bump to version 0.14.0

Browse Source 
- Drop second and third patches (already in version)
- C++ is mandatory since
  153b081a9b

https://github.com/urcu/userspace-rcu/blob/v0.14.0/ChangeLog

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
2023-09-24 17:45:06 +02:00
committed by Peter Korsgaard
parent 1df2976f79
commit ede7d0bd77
11 changed files with 26 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.checkpackageignore
View File

@@ -780,8 +780,6 @@ package/libubootenv/0001-src-CMakeLists.txt-do-not-force-the-build-of-a-share.pa
package/libuhttpd/0001-add-compatibility-for-wolfssl-5-0.patch Upstream package/libuhttpd/0001-add-compatibility-for-wolfssl-5-0.patch Upstream
package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch Upstream package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch Upstream
package/liburcu/0001-Only-blacklist-ARM-gcc-4.8.0-and-4.8.1.patch Upstream package/liburcu/0001-Only-blacklist-ARM-gcc-4.8.0-and-4.8.1.patch Upstream
package/liburcu/0002-fix-don-t-use-C-thread_local-on-MacOs.patch Upstream
package/liburcu/0003-Always-use-__thread-for-Thread-local-storage-except-on-MSVC.patch Upstream
package/libusbgx/0001-Add-include-of-sys-sysmacro.h.patch Upstream package/libusbgx/0001-Add-include-of-sys-sysmacro.h.patch Upstream
package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch Upstream package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch Upstream
package/libuwsc/0002-fix-bad-indentation.patch Upstream package/libuwsc/0002-fix-bad-indentation.patch Upstream

41
package/liburcu/0002-fix-don-t-use-C-thread_local-on-MacOs.patch
View File

@@ -1,41 +0,0 @@
From e915ab84fd0c02d37504f3eb1e1f3be93ea6dc37 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 9 Sep 2021 12:11:16 -0400
Subject: [PATCH] fix: don't use C++ thread_local on MacOs
Recent versions of Apple's clang++ do support 'thread_local' but the
implementation generates additional helper symbols. This is a problem
when accessing an extern TLS variable in a C++ compile unit that is
provided by a C library that doesn't have those extra symbols.
Fallback to using '__thread' on MacOs.
Change-Id: I87cb5b3c9293f7bf66f7115f453b546dd793a449
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
[Retrieved from:
https://github.com/urcu/userspace-rcu/commit/e915ab84fd0c02d37504f3eb1e1f3be93ea6dc37]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
include/urcu/tls-compat.h | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/include/urcu/tls-compat.h b/include/urcu/tls-compat.h
index 24ef1b9a..25cf375a 100644
--- a/include/urcu/tls-compat.h
+++ b/include/urcu/tls-compat.h
@@ -34,7 +34,12 @@ extern "C" {
#ifdef CONFIG_RCU_TLS
-#if defined (__cplusplus) && (__cplusplus >= 201103L)
+/*
+ * Don't use C++ 'thread_local' on MacOs, the implementation is incompatible
+ * with C and will result in a link error when accessing an extern variable
+ * provided by the C library from C++ code.
+ */
+#if defined (__cplusplus) && (__cplusplus >= 201103L) && !defined(__APPLE__)
# define URCU_TLS_STORAGE_CLASS thread_local
#elif defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
# define URCU_TLS_STORAGE_CLASS _Thread_local

53
package/liburcu/0003-Always-use-__thread-for-Thread-local-storage-except-on-MSVC.patch
View File

@@ -1,53 +0,0 @@
From 2e359284497c361e3208501fc70d49b2c54dc4ef Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 14 Sep 2021 10:41:08 -0400
Subject: [PATCH] Always use '__thread' for Thread local storage except on MSVC
Use the GCC extension '__thread' [1] for Thread local storage on all C
and C++ compilers except MSVC.
While C11 and C++11 respectively offer '_Thread_local' and
'thread_local' as potentialy faster implementations, they offer no
guarantees of compatibility when used in a library interface which might
be used by both C and C++ client code.
[1] https://gcc.gnu.org/onlinedocs/gcc/Thread-Local.html
Change-Id: If4fe8bcdbda24b21dedf382112bd5c5f836c00c8
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
[Retrieved from:
https://github.com/urcu/userspace-rcu/commit/2e359284497c361e3208501fc70d49b2c54dc4ef]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
include/urcu/tls-compat.h | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/include/urcu/tls-compat.h b/include/urcu/tls-compat.h
index 25cf375a..a2c94ded 100644
--- a/include/urcu/tls-compat.h
+++ b/include/urcu/tls-compat.h
@@ -35,15 +35,14 @@ extern "C" {
#ifdef CONFIG_RCU_TLS
/*
- * Don't use C++ 'thread_local' on MacOs, the implementation is incompatible
- * with C and will result in a link error when accessing an extern variable
- * provided by the C library from C++ code.
+ * Default to '__thread' on all C and C++ compilers except MSVC. While C11 has
+ * '_Thread_local' and C++11 has 'thread_local', only '__thread' seems to have
+ * a compatible implementation when linking public extern symbols across
+ * language boundaries.
+ *
+ * For more details, see 'https://gcc.gnu.org/onlinedocs/gcc/Thread-Local.html'.
*/
-#if defined (__cplusplus) && (__cplusplus >= 201103L) && !defined(__APPLE__)
-# define URCU_TLS_STORAGE_CLASS thread_local
-#elif defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
-# define URCU_TLS_STORAGE_CLASS _Thread_local
-#elif defined (_MSC_VER)
+#if defined(_MSC_VER)
# define URCU_TLS_STORAGE_CLASS __declspec(thread)
#else
# define URCU_TLS_STORAGE_CLASS __thread

6
package/liburcu/Config.in
View File

@@ -11,6 +11,7 @@ config BR2_PACKAGE_LIBURCU
bool "liburcu" bool "liburcu"
depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_INSTALL_LIBSTDCPP
help help
Userspace implementation of the Read-Copy-Update (RCU) Userspace implementation of the Read-Copy-Update (RCU)
synchronization mechanism. This library is mainly used by synchronization mechanism. This library is mainly used by
@@ -25,6 +26,7 @@ config BR2_PACKAGE_LIBURCU
http://lttng.org/urcu http://lttng.org/urcu
comment "liburcu needs a toolchain w/ threads" comment "liburcu needs a toolchain w/ threads, C++"
depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
depends on !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_INSTALL_LIBSTDCPP

4
package/liburcu/liburcu.hash
View File

@@ -1,5 +1,5 @@
# http://www.lttng.org/files/urcu/userspace-rcu-0.13.2.tar.bz2.sha256 # http://www.lttng.org/files/urcu/userspace-rcu-0.14.0.tar.bz2.sha256
sha256 1213fd9f1b0b74da7de2bb74335b76098db9738fec5d3cdc07c0c524f34fc032 userspace-rcu-0.13.2.tar.bz2 sha256 ca43bf261d4d392cff20dfae440836603bf009fce24fdc9b2697d837a2239d4f userspace-rcu-0.14.0.tar.bz2
# Hash for license files # Hash for license files
sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 lgpl-2.1.txt sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 lgpl-2.1.txt

2
package/liburcu/liburcu.mk
View File

@@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
LIBURCU_VERSION = 0.13.2 LIBURCU_VERSION = 0.14.0
LIBURCU_SITE = http://lttng.org/files/urcu LIBURCU_SITE = http://lttng.org/files/urcu
LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2 LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
LIBURCU_LICENSE = LGPL-2.1+ (library), MIT-like (few source files listed in LICENSE), GPL-2.0+ (test), GPL-3.0 (few *.m4 files) LIBURCU_LICENSE = LGPL-2.1+ (library), MIT-like (few source files listed in LICENSE), GPL-2.0+ (test), GPL-3.0 (few *.m4 files)

6
package/lttng-libust/Config.in
View File

@@ -5,6 +5,7 @@ config BR2_PACKAGE_LTTNG_LIBUST
depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_STATIC_LIBS depends on !BR2_STATIC_LIBS
depends on BR2_INSTALL_LIBSTDCPP # liburcu
select BR2_PACKAGE_LIBURCU select BR2_PACKAGE_LIBURCU
select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_UTIL_LINUX_LIBUUID
@@ -16,6 +17,7 @@ config BR2_PACKAGE_LTTNG_LIBUST
http://lttng.org http://lttng.org
comment "lttng-libust needs a toolchain w/ dynamic library, wchar, threads" comment "lttng-libust needs a toolchain w/ dynamic library, wchar, threads, C++"
depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP

6
package/lttng-tools/Config.in
View File

@@ -4,6 +4,7 @@ config BR2_PACKAGE_LTTNG_TOOLS
depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_STATIC_LIBS # uses dlfcn depends on !BR2_STATIC_LIBS # uses dlfcn
depends on BR2_INSTALL_LIBSTDCPP # liburcu
select BR2_PACKAGE_LIBURCU select BR2_PACKAGE_LIBURCU
select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBXML2
select BR2_PACKAGE_POPT select BR2_PACKAGE_POPT
@@ -27,6 +28,7 @@ config BR2_PACKAGE_LTTNG_TOOLS
http://lttng.org http://lttng.org
comment "lttng-tools needs a toolchain w/ threads, dynamic library" comment "lttng-tools needs a toolchain w/ threads, dynamic library, C++"
depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
!BR2_INSTALL_LIBSTDCPP

6
package/multipath-tools/Config.in
View File

@@ -1,8 +1,9 @@
comment "multipath-tools needs udev and a toolchain w/ threads, dynamic library" comment "multipath-tools needs udev and a toolchain w/ threads, dynamic library, C++"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || !BR2_PACKAGE_HAS_UDEV depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
!BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP
config BR2_PACKAGE_MULTIPATH_TOOLS config BR2_PACKAGE_MULTIPATH_TOOLS
bool "multipath-tools" bool "multipath-tools"
@@ -12,6 +13,7 @@ config BR2_PACKAGE_MULTIPATH_TOOLS
depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
depends on BR2_PACKAGE_HAS_UDEV depends on BR2_PACKAGE_HAS_UDEV
depends on BR2_INSTALL_LIBSTDCPP # liburcu
select BR2_PACKAGE_JSON_C select BR2_PACKAGE_JSON_C
select BR2_PACKAGE_LIBURCU select BR2_PACKAGE_LIBURCU
select BR2_PACKAGE_LIBAIO select BR2_PACKAGE_LIBAIO

4
package/netsniff-ng/Config.in
View File

@@ -3,6 +3,7 @@ config BR2_PACKAGE_NETSNIFF_NG
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthread_spin_lock depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthread_spin_lock
depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
depends on BR2_INSTALL_LIBSTDCPP # liburcu
select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LIBPCAP
select BR2_PACKAGE_LIBNETFILTER_CONNTRACK select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
select BR2_PACKAGE_LIBURCU select BR2_PACKAGE_LIBURCU
@@ -28,7 +29,8 @@ comment "mausezahn needs glibc or musl toolchain"
endif endif
comment "netsniff-ng needs a toolchain w/ NPTL, headers >= 3.0" comment "netsniff-ng needs a toolchain w/ NPTL, C++, headers >= 3.0"
depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
!BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0

6
package/xfsprogs/Config.in
View File

@@ -1,13 +1,15 @@
comment "xfsprogs needs a toolchain w/ threads" comment "xfsprogs needs a toolchain w/ threads, C++"
depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_INSTALL_LIBSTDCPP
config BR2_PACKAGE_XFSPROGS config BR2_PACKAGE_XFSPROGS
bool "xfsprogs" bool "xfsprogs"
depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
depends on BR2_USE_MMU # fork() depends on BR2_USE_MMU # fork()
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_INSTALL_LIBSTDCPP # liburcu
select BR2_PACKAGE_INIH select BR2_PACKAGE_INIH
select BR2_PACKAGE_LIBURCU select BR2_PACKAGE_LIBURCU
select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX