debian/changelog

@@ -73,6 +73,19 @@ glibc (2.35-0experimental0) experimental; urgency=medium
  -- Aurelien Jarno <aurel32@debian.org>  Sun, 07 Aug 2022 22:25:02 +0200
+glibc (2.34-7) unstable; urgency=medium
+
+  [ Samuel Thibault ]
+  * debian/debhelper.in/libc.install, debian/debhelper.in/libc-udeb.install:
+    Allow installing /lib/ld.so, it's required on hurd-i386.
+
+  [ Aurelien Jarno ]
+  * debian/rules, debian/rules.d/build.mk, debian/rules.d/debhelper.mk: read
+    ld.so and libc.so names from upstream generated soversions.mk instead of
+    looking directly for generated binaries.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sat, 27 Aug 2022 13:38:11 +0200
+
 glibc (2.34-6) unstable; urgency=medium
   [ Aurelien Jarno ]

debian/debhelper.in/libc-udeb.install

-lib*/ld*.so.*
+lib*/ld*.so*
 lib/*/ld*.so*
 lib/*/libm.so.*
 lib/*/libmvec.so.*

debian/debhelper.in/libc.install

 etc/ld.so.conf.d
-lib*/ld*.so.*
+lib*/ld*.so*
 lib/*/*.so*
 usr/lib/*/gconv

debian/rules

@@ -90,6 +90,8 @@ slibdir=/lib/$(DEB_HOST_MULTIARCH)
 libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 mvec = no
 
+rtld_so=$(shell awk 'BEGIN {FS="="} /^ld\.so-version/ {print $$2}' $(DEB_BUILDDIR)/soversions.mk)
+libc_so=$(shell awk 'BEGIN {FS="="} /^libc\.so-version/ {print "libc.so"$$2}' $(DEB_BUILDDIR)/soversions.mk)
 
 BASE_CC = gcc
 BASE_CXX = g++

debian/rules.d/build.mk

@@ -248,7 +248,7 @@ ifeq ($(DEB_HOST_ARCH_OS),linux)
 	# Install the Python pretty printers
 	mkdir -p $(CURDIR)/$(debian-tmp)/usr/share/gdb/auto-load/$(call xx,slibdir)
 	perl -pe 'BEGIN {undef $$/; open(IN, "$(DEB_BUILDDIR)/nptl/nptl_lock_constants.py"); $$j=<IN>;} s/from nptl_lock_constants import \*/$$j/g;' \
-		$(CURDIR)/nptl/nptl-printers.py > $(CURDIR)/$(debian-tmp)/usr/share/gdb/auto-load/$(call xx,slibdir)/$(patsubst $(DEB_BUILDDIR)/%,%,$(wildcard $(DEB_BUILDDIR)/libc.so.*)-gdb.py)
+		$(CURDIR)/nptl/nptl-printers.py > $(CURDIR)/$(debian-tmp)/usr/share/gdb/auto-load/$(call xx,slibdir)/$(libc_so)-gdb.py
 endif
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
@@ -304,7 +304,7 @@ ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
 	# - for co-installation for multiarch and biarch libraries
 	# In case slibdir and rtlddir are the same directory (for instance on
 	# libc6-amd64:i386), we instead rename the dynamic linker to ld.so
-	rtld_so=`LANG=C LC_ALL=C readelf -l $(debian-tmp)/usr/bin/iconv | sed -e '/interpreter:/!d;s/.*interpreter: .*\/\(.*\)]/\1/g'`; \
+	rtld_so=$(rtld_so) ; \
 	rtlddir=$(call xx,rtlddir) ; \
 	slibdir=$(call xx,slibdir) ; \
 	if [ "$$rtlddir" = "$$slibdir" ] ; then \

debian/rules.d/debhelper.mk

@@ -193,7 +193,7 @@ $(stamp)debhelper_%: $(stamp)debhelper-common $(stamp)install_%
 	slibdir=$(call xx,slibdir) ; \
 	rtlddir=$(call xx,rtlddir) ; \
 	curpass=$(curpass) ; \
-	rtld_so=`LANG=C LC_ALL=C readelf -l $(debian-tmp)/usr/bin/iconv | sed -e '/interpreter:/!d;s/.*interpreter: .*\/\(.*\)]/\1/g'`; \
+	rtld_so=$(rtld_so) ; \
 	case "$$curpass:$$slibdir" in \
 	  libc:*) \
 	    templates="libc libc-dev libc-udeb" \