From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from vmicros1.altlinux.org (vmicros1.altlinux.org [194.107.17.57]) by sourceware.org (Postfix) with ESMTP id 5F1B13857003 for ; Wed, 9 Dec 2020 00:13:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5F1B13857003 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=altlinux.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=ldv@altlinux.org Received: from mua.local.altlinux.org (mua.local.altlinux.org [192.168.1.14]) by vmicros1.altlinux.org (Postfix) with ESMTP id D45BC72C8B5; Wed, 9 Dec 2020 03:13:12 +0300 (MSK) Received: by mua.local.altlinux.org (Postfix, from userid 508) id AE4797CC8A3; Wed, 9 Dec 2020 03:13:12 +0300 (MSK) Date: Wed, 9 Dec 2020 03:13:12 +0300 From: "Dmitry V. Levin" To: Mark Wielaard Cc: elfutils-devel@sourceware.org Subject: [PATCH v3 2/3] debuginfod: create libdebuginfod.so.1 before libdebuginfod.so Message-ID: <20201209001312.GB3294@altlinux.org> References: <20201130090000.GA30063@altlinux.org> <20201206122813.GA27041@altlinux.org> <70c7aa3cc1fdda6b6c886d714178654dfd0757d0.camel@klomp.org> <20201208151540.GD28403@altlinux.org> <20201208230704.GD3189@wildebeest.org> <20201208232030.GA3078@altlinux.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20201208232030.GA3078@altlinux.org> X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: elfutils-devel@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Elfutils-devel mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Dec 2020 00:13:14 -0000 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 --- 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 + + * Makefile.am [LIBDEBUGINFOD]: Create libdebuginfod.so.1 first, turn + libdebuginfod.so into symlink. + 2020-11-30 Dmitry V. Levin =20 * 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 =3D else libdebuginfod_so_LDLIBS =3D $(libcurl_LIBS) endif -libdebuginfod.so: $(srcdir)/libdebuginfod.map $(libdebuginfod_so_LIBS) +$(LIBDEBUGINFOD_SONAME): $(srcdir)/libdebuginfod.map $(libdebuginfod_so_LI= BS) $(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 =20 -if LIBDEBUGINFOD +libdebuginfod.so: $(LIBDEBUGINFOD_SONAME) + ln -fs $< $@ + install: install-am libdebuginfod.so $(mkinstalldirs) $(DESTDIR)$(libdir) - $(INSTALL_PROGRAM) libdebuginfod.so $(DESTDIR)$(libdir)/libdebuginfod-$(P= ACKAGE_VERSION).so + $(INSTALL_PROGRAM) $(LIBDEBUGINFOD_SONAME) \ + $(DESTDIR)$(libdir)/libdebuginfod-$(PACKAGE_VERSION).so ln -fs libdebuginfod-$(PACKAGE_VERSION).so $(DESTDIR)$(libdir)/$(LIBDEBUG= INFOD_SONAME) ln -fs libdebuginfod-$(PACKAGE_VERSION).so $(DESTDIR)$(libdir)/libdebugin= fod.so =20 --=20 ldv