openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File pkglibdir.patch of Package glibc (Revision 9394d3863005554b07bbc33b381f3eb9)

Currently displaying revision 9394d3863005554b07bbc33b381f3eb9 , Show latest

From 039555cebcda88096a4f14935086e1d201c0e306 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Tue, 2 Apr 2024 12:31:20 +0200
Subject: [PATCH] pkglibdir

---
 Makeconfig | 8 +++++++-
 Makerules  | 6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Makeconfig b/Makeconfig
index 502e4e2d89..f43ee3b699 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -165,6 +165,12 @@ rtlddir = $(slibdir)
 endif
 inst_rtlddir = $(install_root)$(rtlddir)
 
+# Where to install private libraries
+ifndef pkglibdir
+pkglibdir = $(libdir)/glibc
+endif
+inst_pkglibdir = $(install_root)$(pkglibdir)
+
 # Prefix to put on files installed in $(libdir).  For libraries `libNAME.a',
 # the prefix is spliced between `lib' and the name, so the linker switch
 # `-l$(libprefix)NAME' finds the library; for other files the prefix is
@@ -1124,7 +1130,7 @@ object-suffixes-for-libc += .oS
 # example, make that processor-specific.
 CFLAGS-.oS = $(CFLAGS-.o) $(PIC-ccflag) $(extra-nonshared-cflags)
 CPPFLAGS-.oS = $(CPPFLAGS-.o) -DPIC -DLIBC_NONSHARED=1
-libtype.oS = lib%_nonshared.a
+libtype.oS = lib%_nonshared-$(version).a
 endif
 
 # The assembler can generate debug information too.
diff --git a/Makerules b/Makerules
index 275110dda8..e0c5137067 100644
--- a/Makerules
+++ b/Makerules
@@ -1007,15 +1007,15 @@ ifndef subdir
 install: $(inst_libdir)/libc.so
 $(inst_libdir)/libc.so: $(common-objpfx)format.lds \
 			$(common-objpfx)libc.so$(libc.so-version) \
-			$(inst_libdir)/$(patsubst %,$(libtype.oS),\
-						  $(libprefix)$(libc-name)) \
+			$(inst_pkglibdir)/$(patsubst %,$(libtype.oS),\
+						     $(libprefix)$(libc-name)) \
 			$(+force)
 	(echo '/* GNU ld script';\
 	 echo '   Use the shared library, but some functions are only in';\
 	 echo '   the static library, so try that secondarily.  */';\
 	 cat $<; \
 	 echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \
-	      '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
+	      '$(pkglibdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
 	      ' AS_NEEDED (' $(rtlddir)/$(rtld-installed-name) ') )' \
 	) > $@.new
 	mv -f $@.new $@
-- 
2.44.0

Places

File pkglibdir.patch of Package glibc (Revision 9394d3863005554b07bbc33b381f3eb9)

Places