commit: 51f279725662ceba90689bdde0b4b06c21eb9cc1
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 13 17:49:00 2025 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jan 13 17:49:00 2025 +0000
URL: https://gitweb.gentoo.org/proj/sandbox.git/commit/?id=51f27972
Revert "libsandbox: simplify reference to libsbutil"
We really want to treat this more like a static lib rather than a
convenience lib, but libtool doesn't allow that.
Reverts: d9a4a0c97f4840e3c6b84fa6302ed511dd73705b
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
libsandbox/local.mk | 9 ++++++++-
libsbutil/sb_backtrace.c | 1 -
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/libsandbox/local.mk b/libsandbox/local.mk
index b3ccd39..d2fb1d1 100644
--- a/libsandbox/local.mk
+++ b/libsandbox/local.mk
@@ -9,7 +9,14 @@ lib_LTLIBRARIES += %D%/libsandbox.la
-I$(top_srcdir)/libsbutil/include
%C%_libsandbox_la_CFLAGS = $(CFLAG_EXCEPTIONS)
-%C%_libsandbox_la_LIBADD = libsbutil/libsbutil.la $(LIBDL)
+# Could use the following to libsandbox_la_LIBADD, but then libtool links it
+# with --whole-archive, and libsandbox.so increase with a few KB in size:
+# libsbutil/libsbutil.la
+libsbutil/.libs/libsbutil.a: libsbutil/libsbutil.la
+%C%_libsandbox_la_LIBSBLIB = libsbutil/.libs/libsbutil.a
+%C%_libsandbox_la_LIBADD = \
+ $(%C%_libsandbox_la_LIBSBLIB) \
+ $(LIBDL)
# Do not add -nostdlib or -nostartfiles, as then our constructor
# and destructor will not be executed ...
%C%_libsandbox_la_LDFLAGS = \
diff --git a/libsbutil/sb_backtrace.c b/libsbutil/sb_backtrace.c
index f06b781..e3d1ed7 100644
--- a/libsbutil/sb_backtrace.c
+++ b/libsbutil/sb_backtrace.c
@@ -10,7 +10,6 @@
#include "headers.h"
#include "sbutil.h"
-__attribute__((weak))
void __sb_dump_backtrace(void)
{
}
