diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2018-06-28 19:52:19 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2018-06-29 09:00:34 +0200 |
| commit | 4a88d2e4184a3fe0a96aacaf504266d0972582ba (patch) | |
| tree | cf91a185622c23bf0f1d0bca96ac0ab54c0f4f14 /source/l | |
| parent | 233fc224df15f411fad82cafffa1fb5caa79ec03 (diff) | |
| download | current-4a88d2e4184a3fe0a96aacaf504266d0972582ba.tar.gz current-4a88d2e4184a3fe0a96aacaf504266d0972582ba.tar.xz | |
Thu Jun 28 19:52:19 UTC 201820180628195219
a/dcron-4.5-x86_64-9.txz: Rebuilt.
Dropped two patches that were breaking @daily jobs.
Thanks to Dennis Snow for the bug report.
ap/texinfo-6.5-x86_64-6.txz: Rebuilt.
Rebuilt with --disable-perl-xs (use native Perl modules instead of C
versions), which fixes the FTBFS issues we were having with glibc.
Thanks to nobodino, ponce, and mmawhin for the help.
Diffstat (limited to 'source/l')
| -rw-r--r-- | source/l/FTBFSlog | 4 | ||||
| -rwxr-xr-x | source/l/glibc/glibc.SlackBuild | 4 | ||||
| -rw-r--r-- | source/l/glibc/glibc.libc.texinfo.no.utf8.patch | 25 |
3 files changed, 4 insertions, 29 deletions
diff --git a/source/l/FTBFSlog b/source/l/FTBFSlog index 248604e0b..df2314463 100644 --- a/source/l/FTBFSlog +++ b/source/l/FTBFSlog @@ -1,3 +1,7 @@ +Thu Jun 28 17:35:27 UTC 2018 + glibc: removed patch for libc.texinfo since the bug is fixed properly in + the texinfo package now. ++--------------------------+ Wed Jun 27 19:03:51 UTC 2018 glibc: don't request UTF-8 in libc.texinfo since it is built using LANGUAGE=C LC_ALL=C which are non-UTF-8. This leads to a hang if makeinfo diff --git a/source/l/glibc/glibc.SlackBuild b/source/l/glibc/glibc.SlackBuild index cbb8f6854..acaadbeae 100755 --- a/source/l/glibc/glibc.SlackBuild +++ b/source/l/glibc/glibc.SlackBuild @@ -153,10 +153,6 @@ apply_patches() { zcat $CWD/glibc-c-utf8-locale.patch.gz | patch -p1 --verbose || exit 1 # Linux: use reserved name __key in pkey_get [BZ #22797]: zcat $CWD/glibc.pkey_get.56170e0.diff.gz | patch -p1 --verbose || exit 1 - # Don't request UTF-8 in libc.texinfo since it is built using the non-UTF-8 - # C locale, and that causes a hang. This was exposed by the upgrade to - # perl-5.28, but I'm guessing the real bug is in the texinfo package... - zcat $CWD/glibc.libc.texinfo.no.utf8.patch.gz | patch -p1 --verbose || exit 1 } # This is going to be the initial $DESTDIR: diff --git a/source/l/glibc/glibc.libc.texinfo.no.utf8.patch b/source/l/glibc/glibc.libc.texinfo.no.utf8.patch deleted file mode 100644 index 46788dd8d..000000000 --- a/source/l/glibc/glibc.libc.texinfo.no.utf8.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b90ec2dc463a134c7d3438c3b9b478fb0a6c5c94 Mon Sep 17 00:00:00 2001 -From: Patrick J. Volkerding <volkerdi@slackware.com> -Date: Wed Jun 27 18:53:13 UTC 2018 -Subject: [PATCH] Fix hang when locale is not UTF-8 - -This issue seems to have been exposed by the recent upgrade to perl-5.28. -If the system supports UTF-8 in general, but makeinfo is called using a -non-UTF-8 locale (and in this case, glibc calls it with LANG=C), then -makeinfo will get into an infinite loop and hang. We'll work around this -by removing the request for UTF-8 in the affected document. - -An alternate fix would be to call makeinfo like this instead: - -LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8 makeinfo [...] - ---- ./manual/libc.texinfo.orig 2018-02-01 10:17:18.000000000 -0600 -+++ ./manual/libc.texinfo 2018-06-27 13:34:48.901560769 -0500 -@@ -2,7 +2,6 @@ - @comment %**start of header (This is for running Texinfo on a region.) - @setfilename libc.info - @settitle The GNU C Library --@documentencoding UTF-8 - @c '@codequotebacktick on' and '@codequoteundirected on' require - @c Texinfo 5.0 or later, so use the older equivalent @set variables - @c supported in Texinfo 4.11 and later. |