Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:gloriouseggroll
glibc
0004-Revert-Makerules-Remove-lib-version.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0004-Revert-Makerules-Remove-lib-version.patch of Package glibc
From 434c8bd6137f943d5cf005829078bec469a0b1e9 Mon Sep 17 00:00:00 2001 From: Thomas Crider <tcrider@localhost.localdomain> Date: Wed, 16 Nov 2022 12:38:30 -0700 Subject: [PATCH 4/6] Revert 'Makerules: Remove lib-version, ' --- Makerules | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/Makerules b/Makerules index 26a159c0..513432c4 100644 --- a/Makerules +++ b/Makerules @@ -973,21 +973,22 @@ install-lib.so := $(filter %.so,$(install-lib:%_pic.a=%.so)) install-lib := $(filter-out %.so %_pic.a,$(install-lib)) ifeq (yes,$(build-shared)) -# Find which .so's have a version number in their soname. +# Find which .so's have versions. versioned := $(strip $(foreach so,$(install-lib.so),\ $(patsubst %,$(so),$($(so)-version)))) 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 versioned libraries, we install three 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 +lib-version := $(firstword $($(subdir)-version) $(version)) 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:.so=)-$(lib-version).so \ $(inst_slibdir)/$L$($L-version)) # Install all the unversioned shared libraries. @@ -1116,6 +1117,7 @@ include $(o-iterator) generated += $(foreach o,$(versioned),$o$($o-version)) +ifeq (,$($(subdir)-version)) define o-iterator-doit $(inst_slibdir)/$o$($o-version): $(inst_slibdir)/$(o:.so=)-$(version).so \ $(+force); @@ -1130,7 +1132,23 @@ $(inst_slibdir)/$(o:.so=)-$(version).so: $(objpfx)$o $(+force); endef object-suffixes-left := $(versioned) include $(o-iterator) -endif # ifneq (,$(versioned)) +else +define o-iterator-doit +$(inst_slibdir)/$o$($o-version): \ + $(inst_slibdir)/$(o:.so=)-$($(subdir)-version).so $(+force); + $$(make-shlib-link) +endef +object-suffixes-left := $(versioned) +include $(o-iterator) + +define o-iterator-doit +$(inst_slibdir)/$(o:.so=)-$($(subdir)-version).so: $(objpfx)$o $(+force); + $$(do-install-program) +endef +object-suffixes-left := $(versioned) +include $(o-iterator) +endif +endif define do-install-so $(do-install-program) -- 2.38.1
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor