From: "Dmitry V. Levin" <ldv@altlinux.org>
To: Mark Wielaard <mark@klomp.org>
Cc: elfutils-devel@sourceware.org
Subject: [PATCH v3 2/3] debuginfod: create libdebuginfod.so.1 before libdebuginfod.so
Date: Wed, 9 Dec 2020 03:13:12 +0300 [thread overview]
Message-ID: <20201209001312.GB3294@altlinux.org> (raw)
In-Reply-To: <20201208232030.GA3078@altlinux.org>
This would allow to switch from "libdebuginfod-" VERSION ".so"
to DEBUGINFOD_SONAME in __libdwfl_debuginfod_init, and to remove the
fall back to dlopen of "libdebuginfod.so" which is no longer needed.
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
---
debuginfod/ChangeLog | 5 +++++
debuginfod/Makefile.am | 11 ++++++-----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog
index 6eff25cc..3db34b4a 100644
--- a/debuginfod/ChangeLog
+++ b/debuginfod/ChangeLog
@@ -1,3 +1,8 @@
+2020-12-08 Dmitry V. Levin <ldv@altlinux.org>
+
+ * Makefile.am [LIBDEBUGINFOD]: Create libdebuginfod.so.1 first, turn
+ libdebuginfod.so into symlink.
+
2020-11-30 Dmitry V. Levin <ldv@altlinux.org>
* Makefile.am (libdebuginfod.so): Replace $@.$(VERSION) with
diff --git a/debuginfod/Makefile.am b/debuginfod/Makefile.am
index 931a0eb9..13afcd2a 100644
--- a/debuginfod/Makefile.am
+++ b/debuginfod/Makefile.am
@@ -99,20 +99,21 @@ libdebuginfod_so_LDLIBS =
else
libdebuginfod_so_LDLIBS = $(libcurl_LIBS)
endif
-libdebuginfod.so: $(srcdir)/libdebuginfod.map $(libdebuginfod_so_LIBS)
+$(LIBDEBUGINFOD_SONAME): $(srcdir)/libdebuginfod.map $(libdebuginfod_so_LIBS)
$(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ \
-Wl,--soname,$(LIBDEBUGINFOD_SONAME) \
-Wl,--version-script,$<,--no-undefined \
-Wl,--whole-archive $(libdebuginfod_so_LIBS) -Wl,--no-whole-archive \
$(libdebuginfod_so_LDLIBS)
@$(textrel_check)
- $(AM_V_at)ln -fs $@ $(LIBDEBUGINFOD_SONAME)
-endif
-if LIBDEBUGINFOD
+libdebuginfod.so: $(LIBDEBUGINFOD_SONAME)
+ ln -fs $< $@
+
install: install-am libdebuginfod.so
$(mkinstalldirs) $(DESTDIR)$(libdir)
- $(INSTALL_PROGRAM) libdebuginfod.so $(DESTDIR)$(libdir)/libdebuginfod-$(PACKAGE_VERSION).so
+ $(INSTALL_PROGRAM) $(LIBDEBUGINFOD_SONAME) \
+ $(DESTDIR)$(libdir)/libdebuginfod-$(PACKAGE_VERSION).so
ln -fs libdebuginfod-$(PACKAGE_VERSION).so $(DESTDIR)$(libdir)/$(LIBDEBUGINFOD_SONAME)
ln -fs libdebuginfod-$(PACKAGE_VERSION).so $(DESTDIR)$(libdir)/libdebuginfod.so
--
ldv
next prev parent reply other threads:[~2020-12-09 0:13 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-30 9:00 [PATCH] debuginfod: export DEBUGINFOD_SONAME macro in debuginfod.h Dmitry V. Levin
2020-12-06 12:06 ` Mark Wielaard
2020-12-06 12:28 ` Dmitry V. Levin
2020-12-06 13:32 ` Frank Ch. Eigler
2020-12-06 13:34 ` Dmitry V. Levin
2020-12-06 13:54 ` [PATCH v2 1/3] " Dmitry V. Levin
2020-12-06 13:54 ` [PATCH v2 2/3] debuginfod: create the fully versioned libdebuginfod file name during build Dmitry V. Levin
2020-12-06 14:44 ` [PATCH v2 4/3] debuginfod: create libdebuginfod files using a race-free method Dmitry V. Levin
2020-12-06 13:54 ` [PATCH v2 3/3] libdwfl: do not fall back to dlopen of libdebuginfod.so Dmitry V. Levin
2020-12-08 12:02 ` [PATCH] debuginfod: export DEBUGINFOD_SONAME macro in debuginfod.h Mark Wielaard
2020-12-08 13:30 ` Dmitry V. Levin
2020-12-08 15:15 ` Dmitry V. Levin
2020-12-08 23:07 ` Mark Wielaard
2020-12-08 23:20 ` Dmitry V. Levin
2020-12-09 0:12 ` [PATCH v3 1/3] " Dmitry V. Levin
2020-12-09 22:06 ` Mark Wielaard
2020-12-09 0:13 ` Dmitry V. Levin [this message]
2020-12-09 0:30 ` [PATCH v3 2/3] debuginfod: create libdebuginfod.so.1 before libdebuginfod.so Dmitry V. Levin
2020-12-09 22:12 ` Mark Wielaard
2020-12-09 0:13 ` [PATCH v3 3/3] libdwfl: switch to DEBUGINFOD_SONAME, remove libdebuginfod.so fallback Dmitry V. Levin
2020-12-09 22:43 ` Mark Wielaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201209001312.GB3294@altlinux.org \
--to=ldv@altlinux.org \
--cc=elfutils-devel@sourceware.org \
--cc=mark@klomp.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).