From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id F004F3971C35 for ; Wed, 9 Jun 2021 11:16:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org F004F3971C35 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-438-nEbtP8KxPoyGIB5FEK4cOg-1; Wed, 09 Jun 2021 07:16:11 -0400 X-MC-Unique: nEbtP8KxPoyGIB5FEK4cOg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AA2C08049D0 for ; Wed, 9 Jun 2021 11:16:10 +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 E99EF10016F4 for ; Wed, 9 Jun 2021 11:16:09 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH 2/4] Makerules: Remove lib-version, $(subdir-version) In-Reply-To: References: X-From-Line: 4dc82c663bec7646cbb8e2fe52c413f6a6259acf Mon Sep 17 00:00:00 2001 Message-Id: <4dc82c663bec7646cbb8e2fe52c413f6a6259acf.1623237082.git.fweimer@redhat.com> Date: Wed, 09 Jun 2021 13:16:07 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-12.6 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 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-List-Received-Date: Wed, 09 Jun 2021 11:16:15 -0000 Also clarify that the =E2=80=9Cversioned=E2=80=9D term refers to the soname= , not the glibc version (which also ends up in the installed file name). I verified on x86_64-linux-gnu that =E2=80=9Cmake install=E2=80=9D produces= the same files. --- Makerules | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/Makerules b/Makerules index ca9885436e..d3f29d0b89 100644 --- a/Makerules +++ b/Makerules @@ -982,22 +982,21 @@ install-lib.so :=3D $(filter %.so,$(install-lib:%_pic= .a=3D%.so)) install-lib :=3D $(filter-out %.so %_pic.a,$(install-lib)) =20 ifeq (yes,$(build-shared)) -# Find which .so's have versions. +# Find which .so's have a version number in their soname. versioned :=3D $(strip $(foreach so,$(install-lib.so),\ =09=09=09 $(patsubst %,$(so),$($(so)-version)))) =20 install-lib.so-versioned :=3D $(filter $(versioned), $(install-lib.so)) install-lib.so-unversioned :=3D $(filter-out $(versioned), $(install-lib.s= o)) =20 -# For versioned libraries, we install three files: +# For libraries whose soname have version numbers, we install three files: #=09$(inst_libdir)/libfoo.so=09-- for linking, symlink or ld script #=09$(inst_slibdir)/libfoo.so.NN=09-- for loading by SONAME, symlink #=09$(inst_slibdir)/libfoo-X.Y.Z.so -- the real shared object file -lib-version :=3D $(firstword $($(subdir)-version) $(version)) install-lib-nosubdir: $(install-lib.so-unversioned:%=3D$(inst_slibdir)/%) = \ =09=09 $(foreach L,$(install-lib.so-versioned),\ =09=09=09=09$(inst_libdir)/$L \ -=09=09=09=09$(inst_slibdir)/$(L:.so=3D)-$(lib-version).so \ +=09=09=09=09$(inst_slibdir)/$(L:.so=3D)-$(version).so \ =09=09=09=09$(inst_slibdir)/$L$($L-version)) =20 # Install all the unversioned shared libraries. @@ -1125,7 +1124,6 @@ include $(o-iterator) =20 generated +=3D $(foreach o,$(versioned),$o$($o-version)) =20 -ifeq (,$($(subdir)-version)) define o-iterator-doit $(inst_slibdir)/$o$($o-version): $(inst_slibdir)/$(o:.so=3D)-$(version).so= \ =09=09=09=09 $(+force); @@ -1140,23 +1138,7 @@ $(inst_slibdir)/$(o:.so=3D)-$(version).so: $(objpfx)= $o $(+force); endef object-suffixes-left :=3D $(versioned) include $(o-iterator) -else -define o-iterator-doit -$(inst_slibdir)/$o$($o-version): \ - $(inst_slibdir)/$(o:.so=3D)-$($(subdir)-version).so $(+force); -=09$$(make-shlib-link) -endef -object-suffixes-left :=3D $(versioned) -include $(o-iterator) - -define o-iterator-doit -$(inst_slibdir)/$(o:.so=3D)-$($(subdir)-version).so: $(objpfx)$o $(+force)= ; -=09$$(do-install-program) -endef -object-suffixes-left :=3D $(versioned) -include $(o-iterator) -endif -endif +endif # ifneq (,$(versioned)) =20 define do-install-so $(do-install-program) --=20 2.31.1