From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: bug#29537: Core updates broken Date: Sun, 03 Dec 2017 15:13:02 +0100 Message-ID: <87vahnzyq9.fsf@fastmail.com> References: Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eLV1y-0005jx-UI for bug-guix@gnu.org; Sun, 03 Dec 2017 09:14:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eLV1v-0007At-KE for bug-guix@gnu.org; Sun, 03 Dec 2017 09:14:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:33826) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eLV1v-0007Al-DS for bug-guix@gnu.org; Sun, 03 Dec 2017 09:14:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eLV1v-0001Fv-79 for bug-guix@gnu.org; Sun, 03 Dec 2017 09:14:03 -0500 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: =?UTF-8?Q?G=C3=A1bor?= Boskovits , 29537@debbugs.gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable G=C3=A1bor Boskovits writes: > It seems, that we have a breakage in current core-updates. m4, gettext, a= nd > at least a few other packages fail to build. Hello! The problem is that the glibc version string is used a couple of places to determine where locales are found. The attached patch fixes it, though I'm not sure if it's the best approach. Thoughts? --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-glibc-Don-t-use-full-version-string-in-locale-pa.patch Content-Transfer-Encoding: quoted-printable From=2041677631be815d58c36052de7b54d297ad496ec1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 3 Dec 2017 02:32:16 +0100 Subject: [PATCH] gnu: glibc: Don't use full version string in locale path. This is a follow-up to commit ee3ebf1a357bd4eb36a2fa1790a7b549cffb305a. Fixes . * gnu/packages/base.scm (glibc/linux)[version]: Change to 2.26.91-gaaa2eb83= b8. [source](uri): Adjust accordingly. [arguments]: Use VERSION-MAJOR+MINOR for locales path. (glibc-locales, glibc-utf8-locales): Likewise. * guix/profiles.scm (ca-certificate-bundle, profile-derivation): Likewise. =2D-- gnu/packages/base.scm | 15 ++++++++++----- guix/profiles.scm | 6 ++++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index c8fd8624a..8190a38ed 100644 =2D-- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -523,11 +523,15 @@ store.") ;; archive can be generated by checking out the commit ID and running: ;; git archive --prefix=3D$(git describe)/ HEAD | xz -9 > $(git describ= e).tar.xz ;; See for details. =2D (version "2.26-91-gaaa2eb83b8") + ;; + ;; Note: Always use a dot after the minor version since various places = rely + ;; on "version-major+minor" to determine where locales are found. + (version "2.26.91-gaaa2eb83b8") (source (origin (method url-fetch) (uri (string-append "https://alpha.gnu.org/gnu/guix/mirror/" =2D "glibc-" version ".tar.xz")) + "glibc-" (version-major+minor version) "-" + (caddr (string-split version #\.)) ".tar.x= z")) (sha256 (base32 "1zwz6d0x3ndd0hgqp17fx71miyjvn4dgkl1nzhaz3mbcqxzrprhk")) @@ -585,7 +589,7 @@ store.") ;; `--localedir' is not honored, so work around it. ;; See . (string-append "libc_cv_complocaledir=3D/run/current-system/lo= cale/" =2D ,version) + ,(version-major+minor version)) =20 (string-append "--with-headers=3D" (assoc-ref ,(if (%current-target-system) @@ -955,7 +959,8 @@ the 'share/locale' sub-directory of this package.") (list (string-append "libc_cv_complocaledir=3D" (assoc-ref %outputs "out") "/lib/locale/" =2D ,(package-version glibc)))))))))) + ,(version-major+minor + (package-version glibc))))))))))) =20 (define-public glibc-utf8-locales (package @@ -973,7 +978,7 @@ the 'share/locale' sub-directory of this package.") (gzip (assoc-ref %build-inputs "gzip")) (out (assoc-ref %outputs "out")) (localedir (string-append out "/lib/locale/" =2D ,version))) + ,(version-major+minor = version)))) ;; 'localedef' needs 'gzip'. (setenv "PATH" (string-append libc "/bin:" gzip "/bin= ")) =20 diff --git a/guix/profiles.scm b/guix/profiles.scm index 0eb99f40d..51c330b32 100644 =2D-- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -812,7 +812,8 @@ MANIFEST. Single-file bundles are required by programs= such as Git and Lynx." ;; install a UTF-8 locale. (setenv "LOCPATH" (string-append #+glibc-utf8-locales "/lib/locale/" =2D #+(package-version glibc-utf8-locales))) + #+(version-major+minor + (package-version glibc-utf8-locales)))) (setlocale LC_ALL "en_US.utf8") =20 (match (append-map ca-files '#$(manifest-inputs manifest)) @@ -1256,7 +1257,8 @@ are cross-built for TARGET." #~(begin (setenv "LOCPATH" #$(file-append glibc-utf8-locales "/lib/locale/" =2D (package-version glibc-utf8-locales))) + (version-major+minor + (package-version glibc-utf8-locales)))) (setlocale LC_ALL "en_US.utf8"))) =20 (define builder =2D-=20 2.15.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlokBm8ACgkQoqBt8qM6 VPrXnggAg8Ydqj5LvMCUxvdRhhKbt3X2tdS/qiYwSJPTJyVZzQCc3BqW87XijbY/ kwM2VYAmNO0k7nuw8syIlZ7ecYoqPIugnF8Ju6gARjo3T7Oxhe61PR7jQGSgZEYz lt9pfmTNXHrDE2RyUGKKrAR4fQk6d6SctTMCqs8yj8Uux2jlhVcO0HYlVPoThc+b JnjAb8hFKzI+CXHQMrW/PUJ/eMtz2Uf9q4PcdtY9+Zg2y4Qo48CXuxVk0uAQ27W9 BoKkLmbBk1SB5KEyOfu6MICedxozWWw7UuEw7B9XwwBhOihcrAhgv3VaNhHK8ujA fDO1x26md7Y3KpBCHhR9QDKFu3LfvA== =xTTH -----END PGP SIGNATURE----- --==-=-=--