diff mbox series

[meta-oe,4/8] libtorrent: upgrade 0.16.26 -> 0.16.27

Message ID 20261029233102.1177876-4-ankur.tyagi85@gmail.com
State Under Review
Headers show
Series [meta-oe,1/8] json-schema-validator: upgrade 2.4.0 -> 2.4.1 | expand

Commit Message

Ankur Tyagi Oct. 29, 2026, 11:30 p.m. UTC 
From: Ankur Tyagi <ankur.tyagi85@gmail.com>

Dropped patch that is part of the upstream version.

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 ...e-atomic-test-program-from-being-opt.patch | 57 -------------------
 ...rrent_0.16.26.bb => libtorrent_0.16.27.bb} |  3 +-
 2 files changed, 1 insertion(+), 59 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-checks.m4-Keep-the-atomic-test-program-from-being-opt.patch
 rename meta-oe/recipes-connectivity/libtorrent/{libtorrent_0.16.26.bb => libtorrent_0.16.27.bb} (85%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-checks.m4-Keep-the-atomic-test-program-from-being-opt.patch b/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-checks.m4-Keep-the-atomic-test-program-from-being-opt.patch
deleted file mode 100644
index 704ec754dc..0000000000
--- a/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-checks.m4-Keep-the-atomic-test-program-from-being-opt.patch
+++ /dev/null
@@ -1,57 +0,0 @@ 
-From: Khem Raj <khem.raj@oss.qualcomm.com>
-Date: Wed, 21 Oct 2026 13:00:00 -0700
-Subject: [PATCH] checks.m4: Keep the atomic test program from being optimized
- away
-
-TORRENT_CHECK_ATOMIC decides whether -latomic is needed by linking a
-program that loads from a local std::atomic<uint64_t>. The atomic never
-escapes, so with -O2 in CXXFLAGS clang folds the load to a constant and
-no __atomic_* call is emitted. The check then reports that -latomic is
-not required even on targets that need it for 64-bit atomics, such as
-riscv32, and linking fails later:
-
-  ld.lld: error: undefined symbol: __atomic_load_8
-
-Make the atomic global and modify it with fetch_add() so the atomic
-operations are emitted at any optimization level.
-
-Upstream-Status: Submitted [https://github.com/rakshasa/libtorrent/pull/1020]
-Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
----
- scripts/checks.m4 | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
---- a/scripts/checks.m4
-+++ b/scripts/checks.m4
-@@ -99,13 +99,17 @@
- ])
- 
- 
-+# The atomic is global and modified with a read-modify-write operation,
-+# otherwise the compiler can optimize the operations away and the program
-+# links without libatomic even on targets that need it.
- AC_DEFUN([TORRENT_CHECK_ATOMIC], [
-   AC_MSG_CHECKING([whether 64-bit atomic operations require -latomic])
-   AC_LANG_PUSH(C++)
- 
-   AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <cstdint>
--                                    #include <atomic>]],
--                                    [[std::atomic<uint64_t> x(0);
-+                                    #include <atomic>
-+                                    std::atomic<uint64_t> x(0);]],
-+                                    [[x.fetch_add(1);
-                                     return x.load();]])],
-     [
-       AC_MSG_RESULT([no])
-@@ -116,8 +120,9 @@
-       LIBS="$LIBS -latomic"
- 
-       AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <cstdint>
--                                        #include <atomic>]],
--                                        [[std::atomic<uint64_t> x(0);
-+                                        #include <atomic>
-+                                        std::atomic<uint64_t> x(0);]],
-+                                        [[x.fetch_add(1);
-                                         return x.load();]])],
-         [
-           AC_MSG_RESULT([yes])
diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.16.26.bb b/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.16.27.bb
similarity index 85%
rename from meta-oe/recipes-connectivity/libtorrent/libtorrent_0.16.26.bb
rename to meta-oe/recipes-connectivity/libtorrent/libtorrent_0.16.27.bb
index 2de8d5d31a..b54f7ffa0a 100644
--- a/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.16.26.bb
+++ b/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.16.27.bb
@@ -7,9 +7,8 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 DEPENDS = "zlib curl libsigc++-2.0 openssl cppunit"
 
 SRC_URI = "git://github.com/rakshasa/libtorrent;branch=master;protocol=https;tag=v${PV} \
-           file://0001-checks.m4-Keep-the-atomic-test-program-from-being-opt.patch \
            "
-SRCREV = "21daa3b96a3b8cfe14961545b5115de7ed12da95"
+SRCREV = "47114f095b3476ed4ccd8dbee6f027f5905adce7"
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"