From 238c4c5cd8799e6b88347751f59545cfcb230ec4 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 13 May 2025 08:39:42 -0400 Subject: [PATCH] Fix linking on systems without a working stdatomic.h Static libraries need to be sorted in a dependency order, with the most low-level libraries last. When we added an atomic counter to util_bug.c in !760, we introduced a dependency from "log" to "threads". This didn't show up immediately, since the dependency only exists when we're emulating atomic operations due to lack of platform support. Fixes bug #41076; bugfix on 0.4.9.1-alpha. --- Makefile.am | 4 ++-- changes/bug41076 | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 changes/bug41076 diff --git a/Makefile.am b/Makefile.am index ed43ec72fc..02ab2f296e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,12 +50,12 @@ TOR_UTIL_LIBS = \ src/lib/libtor-sandbox.a \ src/lib/libtor-container.a \ src/lib/libtor-net.a \ - src/lib/libtor-thread.a \ src/lib/libtor-memarea.a \ src/lib/libtor-math.a \ src/lib/libtor-meminfo.a \ src/lib/libtor-osinfo.a \ src/lib/libtor-log.a \ + src/lib/libtor-thread.a \ src/lib/libtor-lock.a \ src/lib/libtor-fdio.a \ src/lib/libtor-string.a \ @@ -86,13 +86,13 @@ TOR_UTIL_TESTING_LIBS = \ src/lib/libtor-sandbox-testing.a \ src/lib/libtor-container-testing.a \ src/lib/libtor-net-testing.a \ - src/lib/libtor-thread-testing.a \ src/lib/libtor-memarea-testing.a \ src/lib/libtor-math-testing.a \ src/lib/libtor-meminfo-testing.a \ src/lib/libtor-osinfo-testing.a \ src/lib/libtor-term-testing.a \ src/lib/libtor-log-testing.a \ + src/lib/libtor-thread-testing.a \ src/lib/libtor-lock-testing.a \ src/lib/libtor-fdio-testing.a \ src/lib/libtor-string-testing.a \ diff --git a/changes/bug41076 b/changes/bug41076 new file mode 100644 index 0000000000..06ce264d6f --- /dev/null +++ b/changes/bug41076 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Fix linking on systems without a working stdatomic.h. + Fixes bug 41076; bugfix on 0.4.9.1-alpha. -- 2.47.3