Signed-off-by: Alexander Kanavin <[email protected]> --- ...k-with-latomic-only-if-no-atomic-bui.patch | 46 ------------------- .../{libusb1_1.0.26.bb => libusb1_1.0.27.bb} | 7 ++- 2 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 meta/recipes-support/libusb/libusb1/0001-configure.ac-Link-with-latomic-only-if-no-atomic-bui.patch rename meta/recipes-support/libusb/{libusb1_1.0.26.bb => libusb1_1.0.27.bb} (83%)
diff --git a/meta/recipes-support/libusb/libusb1/0001-configure.ac-Link-with-latomic-only-if-no-atomic-bui.patch b/meta/recipes-support/libusb/libusb1/0001-configure.ac-Link-with-latomic-only-if-no-atomic-bui.patch deleted file mode 100644 index 3c223e0822f..00000000000 --- a/meta/recipes-support/libusb/libusb1/0001-configure.ac-Link-with-latomic-only-if-no-atomic-bui.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 95e601ce116dd46ea7915c171976b85ea0905d58 Mon Sep 17 00:00:00 2001 -From: Lonnie Abelbeck <[email protected]> -Date: Sun, 8 May 2022 14:05:56 -0500 -Subject: [PATCH] configure.ac: Link with -latomic only if no atomic builtins - -Follow-up to 561dbda, a check of GCC atomic builtins needs to be done -first. - -I'm no autoconf guru, but using this: -https://github.com/mesa3d/mesa/blob/0df485c285b73c34ba9062f0c27e55c3c702930d/configure.ac#L469 -as inspiration, I created a pre-check before calling AC_SEARCH_LIBS(...) - -Fixes #1135 -Closes #1139 -Upstream-Status: Backport [https://github.com/kraj/libusb/commit/95e601ce116dd46ea7915c171976b85ea0905d58] -Signed-off-by: Khem Raj <[email protected]> ---- - configure.ac | 16 +++++++++++++++- - libusb/version_nano.h | 2 +- - 2 files changed, 16 insertions(+), 2 deletions(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -153,7 +153,21 @@ if test "x$platform" = xposix; then - AC_SEARCH_LIBS([pthread_create], [pthread], - [test "x$ac_cv_search_pthread_create" != "xnone required" && AC_SUBST(THREAD_LIBS, [-lpthread])], - [], []) -- AC_SEARCH_LIBS([__atomic_fetch_add_4], [atomic]) -+ dnl Check for new-style atomic builtins. We first check without linking to -latomic. -+ AC_MSG_CHECKING(whether __atomic_load_n is supported) -+ AC_LINK_IFELSE([AC_LANG_SOURCE([[ -+ #include <stdint.h> -+ int main() { -+ struct { -+ uint64_t *v; -+ } x; -+ return (int)__atomic_load_n(x.v, __ATOMIC_ACQUIRE) & -+ (int)__atomic_add_fetch(x.v, (uint64_t)1, __ATOMIC_ACQ_REL); -+ }]])], GCC_ATOMIC_BUILTINS_SUPPORTED=yes, GCC_ATOMIC_BUILTINS_SUPPORTED=no) -+ AC_MSG_RESULT($GCC_ATOMIC_BUILTINS_SUPPORTED) -+ if test "x$GCC_ATOMIC_BUILTINS_SUPPORTED" != xyes; then -+ AC_SEARCH_LIBS([__atomic_fetch_add_4], [atomic]) -+ fi - elif test "x$platform" = xwindows; then - AC_DEFINE([PLATFORM_WINDOWS], [1], [Define to 1 if compiling for a Windows platform.]) - else diff --git a/meta/recipes-support/libusb/libusb1_1.0.26.bb b/meta/recipes-support/libusb/libusb1_1.0.27.bb similarity index 83% rename from meta/recipes-support/libusb/libusb1_1.0.26.bb rename to meta/recipes-support/libusb/libusb1_1.0.27.bb index 2af6fcdea79..f2431d75c89 100644 --- a/meta/recipes-support/libusb/libusb1_1.0.26.bb +++ b/meta/recipes-support/libusb/libusb1_1.0.27.bb @@ -11,14 +11,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" BBCLASSEXTEND = "native nativesdk" SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libusb-${PV}.tar.bz2 \ - file://0001-configure.ac-Link-with-latomic-only-if-no-atomic-bui.patch \ file://run-ptest \ - " + " GITHUB_BASE_URI = "https://github.com/libusb/libusb/releases"; UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$" -SRC_URI[sha256sum] = "12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5" +SRC_URI[sha256sum] = "ffaa41d741a8a3bee244ac8e54a72ea05bf2879663c098c82fc5757853441575" S = "${WORKDIR}/libusb-${PV}" @@ -41,7 +40,7 @@ do_compile_ptest() { } do_install_ptest() { - install -m 755 ${B}/tests/.libs/stress ${D}${PTEST_PATH} + install -m 755 ${B}/tests/stress ${D}${PTEST_PATH} } FILES:${PN} += "${base_libdir}/*.so.*" -- 2.39.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#196703): https://lists.openembedded.org/g/openembedded-core/message/196703 Mute This Topic: https://lists.openembedded.org/mt/104767961/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
