gnu: glibc-static: Fix static NSS support.

Support for static NSS broke in glibc 2.33, meaning that 'getpw' &
co. would always fail.  This patch backports the upstream fix to
reinstate it.

Reported by Marius Bakke.

* gnu/packages/patches/glibc-static-nss.patch: New file.
* gnu/packages/make-bootstrap.scm (glibc-for-bootstrap): Use it.
* gnu/local.mk (dist_patch_DATA): Add it.
This commit is contained in:
Ludovic Courtès 2021-09-06 13:46:47 +02:00
parent 93bf42361c
commit 08005133ec
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
3 changed files with 1250 additions and 3 deletions

View file

@ -1146,6 +1146,7 @@ dist_patch_DATA = \
%D%/packages/patches/glibc-versioned-locpath.patch \ %D%/packages/patches/glibc-versioned-locpath.patch \
%D%/packages/patches/glibc-2.29-git-updates.patch \ %D%/packages/patches/glibc-2.29-git-updates.patch \
%D%/packages/patches/glibc-2.29-supported-locales.patch \ %D%/packages/patches/glibc-2.29-supported-locales.patch \
%D%/packages/patches/glibc-static-nss.patch \
%D%/packages/patches/glibc-supported-locales.patch \ %D%/packages/patches/glibc-supported-locales.patch \
%D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \
%D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gmp-faulty-test.patch \

View file

@ -30,7 +30,7 @@ (define-module (gnu packages make-bootstrap)
#:use-module ((guix licenses) #:select (gpl3+)) #:use-module ((guix licenses) #:select (gpl3+))
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module ((gnu packages) #:select (search-patch)) #:use-module ((gnu packages) #:select (search-patch search-patches))
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages cross-base) #:use-module (gnu packages cross-base)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
@ -73,8 +73,10 @@ (define glibc-for-bootstrap
(package (package
(inherit base) (inherit base)
(source (origin (inherit (package-source base)) (source (origin (inherit (package-source base))
(patches (cons (search-patch "glibc-bootstrap-system.patch") (patches (append (search-patches
(origin-patches (package-source base)))))) "glibc-bootstrap-system.patch"
"glibc-static-nss.patch")
(origin-patches (package-source base))))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments base) (substitute-keyword-arguments (package-arguments base)
((#:configure-flags flags) ((#:configure-flags flags)

File diff suppressed because it is too large Load diff