[PR PATCH] glibc: restore debug symbols

[PR PATCH] glibc: restore debug symbols

[ailiop-git]

[-- Attachment #1: Type: text/plain, Size: 2091 bytes --]

There is a new pull request by ailiop-git against master on the void-packages repository

https://github.com/ailiop-git/void-packages glibc
https://github.com/void-linux/void-packages/pull/30216

glibc: restore debug symbols
commit b5a52cc50a13 ("glibc: do not strip shlibs to make valgrind work
ootb.") had added the main glibc shared libraries in the nostrip list so
that valgrind could work out of the box. As mentioned in that commit
message, this had the side-effect of making the glibc-dbg package lack
the debug symbols for all those libraries.

Restore all glibc debug symbol generation by removing all those shared
libraries from the nostrip list, so that symbolic debugging of glibc is
made possible.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30216.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glibc-30216.patch --]
[-- Type: text/x-diff, Size: 2381 bytes --]

From 3329f2060476b2f4226ed3be98b98d89394f73b8 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 13 Apr 2021 20:25:50 +0200
Subject: [PATCH] glibc: restore debug symbols

commit b5a52cc50a13 ("glibc: do not strip shlibs to make valgrind work
ootb.") had added the main glibc shared libraries in the nostrip list so
that valgrind could work out of the box. As mentioned in that commit
message, this had the side-effect of making the glibc-dbg package lack
the debug symbols for all those libraries.

Restore all glibc debug symbol generation by removing all those shared
libraries from the nostrip list, so that symbolic debugging of glibc is
made possible.
---
 srcpkgs/glibc/template | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 9202e4145453..2187492e0716 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,7 +1,7 @@
 # Template file for 'glibc'
 pkgname=glibc
 version=2.32
-revision=1
+revision=2
 bootstrap=yes
 short_desc="GNU C library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -20,36 +20,17 @@ nostrip_files="
 	POSIX_V7_ILP32_OFFBIG
 	POSIX_V6_LP64_OFF64
 	POSIX_V7_LP64_OFF64
-	XBS5_LP64_OFF64
-	ld-${version}.so
-	libdl-${version}.so
-	libanl-${version}.so
-	libcidn-${version}.so
-	libresolv-${version}.so
-	libcrypt-${version}.so
-	libpthread-${version}.so
-	libm-${version}.so
-	libutil-${version}.so
-	libthread_db-1.0.so
-	librt-${version}.so
-	libnsl-${version}.so
-	libc-${version}.so
-	libBrokenLocale-${version}.so
-	libnss_compat-${version}.so
-	libnss_db-${version}.so
-	libnss_dns-${version}.so
-	libnss_files-${version}.so
-	libnss_hesiod-${version}.so
-	libnss_nisplus-${version}.so
-	libnss_nis-${version}.so"
+	XBS5_LP64_OFF64"
 
 conf_files="
 	/etc/rpc
 	/etc/gai.conf
 	/etc/ld.so.conf"
+
 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="bison perl python3 texinfo"
 fi
+
 makedepends="kernel-libc-headers"
 lib32files="/usr/lib/gconv/gconv-modules"
 lib32symlinks="ld-linux.so.2"
@@ -118,6 +99,7 @@ do_build() {
 	cd build
 	make ${makejobs}
 }
+
 do_install() {
 	vlicense LICENSES
 	# Create DESTDIR/etc/ld.so.conf
@@ -192,6 +174,7 @@ glibc-devel_package() {
 		fi
 	}
 }
+
 glibc-locales_package() {
 	conf_files="/etc/default/libc-locales"
 	short_desc+=" - locale data files"

Re: glibc: restore debug symbols

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 320 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30216#issuecomment-818972512

Comment:
I'm not sure what this fixes; `nostrip_files` should only mean that the debug symbols are kept in the shared libraries themselves instead of in a separate file under `/usr/debug`.

Re: glibc: restore debug symbols

[ailiop-git]

[-- Attachment #1: Type: text/plain, Size: 627 bytes --]

New comment by ailiop-git on void-packages repository

https://github.com/void-linux/void-packages/pull/30216#issuecomment-819001345

Comment:
> I'm not sure what this fixes; `nostrip_files` should only mean that the debug symbols are kept in the shared libraries themselves instead of in a separate file under `/usr/debug`.

Indeed. I was debugging an issue on glibc-2.33 and symbols were unresolvable for some reason (it must have been a stale glibc from a non-debug build of mine). I just checked on a fresh base-voidstrap from the official repos, it seems to be working fine.

Sorry for the noise, I'll close this one.

Re: [PR PATCH] [Closed]: glibc: restore debug symbols

[ailiop-git]

[-- Attachment #1: Type: text/plain, Size: 1936 bytes --]

There's a closed pull request on the void-packages repository

glibc: restore debug symbols
https://github.com/void-linux/void-packages/pull/30216

Description:
commit b5a52cc50a13 ("glibc: do not strip shlibs to make valgrind work
ootb.") had added the main glibc shared libraries in the nostrip list so
that valgrind could work out of the box. As mentioned in that commit
message, this had the side-effect of making the glibc-dbg package lack
the debug symbols for all those libraries.

Restore all glibc debug symbol generation by removing all those shared
libraries from the nostrip list, so that symbolic debugging of glibc is
made possible.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->