From patchwork Thu Jun 10 08:23:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 43806 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9CC8E3AAA0AA for ; Thu, 10 Jun 2021 08:26:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9CC8E3AAA0AA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1623313582; bh=V1y187OhG/tDQyymCwa1cwjPv4jrbmsFzV8/FgCIMr4=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=J2g9Pwz2GoJyzTqmOFgLOwn4XHxhQMCA6KWho052UbG1iKlYhjhFDSW16lov4exE5 vq6K/hwsbVXQk20aTcEBqZ0VW6IDbEHaiMi84O5Y2azfSu3bkeIQDtju5XmpdejLd3 9MIOlH/2xT8Sf7Igo/llsFQ5d28Bd7YGcIJxPoo8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id C06343AAA09F for ; Thu, 10 Jun 2021 08:23:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C06343AAA09F Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-561-HeleBkfqMIaseNvnFRxiHw-1; Thu, 10 Jun 2021 04:23:20 -0400 X-MC-Unique: HeleBkfqMIaseNvnFRxiHw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 872591012582 for ; Thu, 10 Jun 2021 08:23:19 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-115-60.ams2.redhat.com [10.36.115.60]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ADE829CA0 for ; Thu, 10 Jun 2021 08:23:18 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 4/4] Install shared objects under their ABI names In-Reply-To: References: X-From-Line: eae14c3d57b3fef43892ca304f2d8017555e8447 Mon Sep 17 00:00:00 2001 Message-Id: Date: Thu, 10 Jun 2021 10:23:16 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP, URIBL_BLACK 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: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Previously, the installed objects were named like libc-2.33.so, and the ABI soname libc.so.6 was just a symbolic link. The Makefile targets to install these symbolic links are no longer needed after this, so they are removed with this commit. The more general $(make-link) command (which invokes scripts/rellns-sh) is retained because other symbolic links are still needed. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- INSTALL | 10 ++++++++++ Makefile | 6 ------ Makerules | 45 +++++---------------------------------------- NEWS | 8 ++++++++ elf/Makefile | 10 ++-------- 5 files changed, 25 insertions(+), 54 deletions(-) diff --git a/INSTALL b/INSTALL index bc761ab98b..ed5f66489b 100644 --- a/INSTALL +++ b/INSTALL @@ -199,6 +199,16 @@ if 'CFLAGS' is specified it must enable optimization. For example: RELRO and a read-only global offset table (GOT), at the cost of slightly increased program load times. +'--disable-major-minor-libraries' + Do not install shared objects under file names that contain the + major and minor version of the GNU C Library. By default, such + names are used, and the names defined by the ABI are provided as + symbolic links only. This causes problems with certain package + managers during library upgrades and (in particular) downgrades, so + this option can be used to install these shared objects directly + under their ABI-defined names, without an additional indirection + via symbolic links. + '--enable-pt_chown' The file 'pt_chown' is a helper binary for 'grantpt' (*note Pseudo-Terminals: Allocation.) that is installed setuid root to fix diff --git a/Makefile b/Makefile index 242d36de91..c115c652a0 100644 --- a/Makefile +++ b/Makefile @@ -109,12 +109,6 @@ elf/ldso_install: # Ignore the error if we cannot update /etc/ld.so.cache. ifeq (no,$(cross-compiling)) ifeq (yes,$(build-shared)) -install: install-symbolic-link -.PHONY: install-symbolic-link -install-symbolic-link: subdir_install - $(symbolic-link-prog) $(symbolic-link-list) - rm -f $(symbolic-link-list) - install: -test ! -x $(elf-objpfx)ldconfig || LC_ALL=C \ $(elf-objpfx)ldconfig $(addprefix -r ,$(install_root)) \ diff --git a/Makerules b/Makerules index d3f29d0b89..6efff78fbe 100644 --- a/Makerules +++ b/Makerules @@ -989,14 +989,12 @@ versioned := $(strip $(foreach so,$(install-lib.so),\ install-lib.so-versioned := $(filter $(versioned), $(install-lib.so)) install-lib.so-unversioned := $(filter-out $(versioned), $(install-lib.so)) -# For libraries whose soname have version numbers, we install three files: +# For libraries whose soname have version numbers, we install two files: # $(inst_libdir)/libfoo.so -- for linking, symlink or ld script -# $(inst_slibdir)/libfoo.so.NN -- for loading by SONAME, symlink -# $(inst_slibdir)/libfoo-X.Y.Z.so -- the real shared object file +# $(inst_slibdir)/libfoo.so.NN -- for loading by SONAME install-lib-nosubdir: $(install-lib.so-unversioned:%=$(inst_slibdir)/%) \ $(foreach L,$(install-lib.so-versioned),\ $(inst_libdir)/$L \ - $(inst_slibdir)/$(L:.so=)-$(version).so \ $(inst_slibdir)/$L$($L-version)) # Install all the unversioned shared libraries. @@ -1029,35 +1027,10 @@ ln -f $(objpfx)/$(@F) $@ endef endif -ifeq (yes,$(build-shared)) -ifeq (no,$(cross-compiling)) -symbolic-link-prog := $(elf-objpfx)sln -symbolic-link-list := $(elf-objpfx)symlink.list -define make-shlib-link -echo `$(..)scripts/rellns-sh -p $< $@` $@ >> $(symbolic-link-list) -endef -else # cross-compiling -# We need a definition that can be used by elf/Makefile's install rules. -symbolic-link-prog = $(LN_S) -endif -endif -ifndef make-shlib-link -define make-shlib-link -rm -f $@ -$(LN_S) `$(..)scripts/rellns-sh -p $< $@` $@ -endef -endif - ifdef libc.so-version -# For a library specified to be version N, install three files: -# libc.so -> libc.so.N (e.g. libc.so.6) -# libc.so.6 -> libc-VERSION.so (e.g. libc-1.10.so) - -$(inst_slibdir)/libc.so$(libc.so-version): $(inst_slibdir)/libc-$(version).so \ - $(+force) - $(make-shlib-link) -$(inst_slibdir)/libc-$(version).so: $(common-objpfx)libc.so $(+force) +$(inst_slibdir)/libc.so$(libc.so-version): $(common-objpfx)libc.so $(+force) $(do-install-program) + install: $(inst_slibdir)/libc.so$(libc.so-version) # This fragment of linker script gives the OUTPUT_FORMAT statement @@ -1125,15 +1098,7 @@ include $(o-iterator) generated += $(foreach o,$(versioned),$o$($o-version)) define o-iterator-doit -$(inst_slibdir)/$o$($o-version): $(inst_slibdir)/$(o:.so=)-$(version).so \ - $(+force); - $$(make-shlib-link) -endef -object-suffixes-left := $(versioned) -include $(o-iterator) - -define o-iterator-doit -$(inst_slibdir)/$(o:.so=)-$(version).so: $(objpfx)$o $(+force); +$(inst_slibdir)/$o$($o-version): $(objpfx)$o $(+force); $$(do-install-program) endef object-suffixes-left := $(versioned) diff --git a/NEWS b/NEWS index 1bf3daa502..1634e20ce5 100644 --- a/NEWS +++ b/NEWS @@ -48,6 +48,14 @@ Deprecated and removed features, and other changes affecting compatibility: * The function pthread_yield has been deprecated; programs should use the equivalent standard function sched_yield instead. +* Previously, glibc installed its various shared objects under versioned + file names such as libc-2.33.so. The ABI sonames (e.g., libc.so.6) + were provided as symbolic links. Starting with glibc 2.34, the shared + objects are installed under their ABI sonames directly, without + symbolic links. This increases compatibility with distribution + package managers that delete removed files late during the package + upgrade or downgrade process. + Changes to build and runtime requirements: * On Linux, the shm_open, sem_open, and related functions now expect the diff --git a/elf/Makefile b/elf/Makefile index 1751f5ec67..02f634c192 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -628,20 +628,14 @@ $(objpfx)trusted-dirs.st: Makefile $(..)Makeconfig CPPFLAGS-dl-load.c += -I$(objpfx). -I$(csu-objpfx). ifeq (yes,$(build-shared)) -$(inst_slibdir)/$(rtld-version-installed-name): $(objpfx)ld.so $(+force) +$(inst_rtlddir)/$(rtld-installed-name): $(objpfx)ld.so $(+force) $(make-target-directory) $(do-install-program) -$(inst_rtlddir)/$(rtld-installed-name): \ - $(inst_slibdir)/$(rtld-version-installed-name) \ - $(inst_slibdir)/libc-$(version).so - $(make-target-directory) - $(make-shlib-link) - # Special target called by parent to install just the dynamic linker. .PHONY: ldso_install ldso_install: $(inst_rtlddir)/$(rtld-installed-name) -endif +endif # $(build-shared) # Workarounds for ${exec_prefix} expansion in configure variables.