From: Paul Eggert <eggert@cs.ucla.edu>
To: Lars Ingebrigtsen <larsi@gnus.org>
Cc: 32452@debbugs.gnu.org, bug-gnulib@gnu.org, npostavs@gmail.com
Subject: bug#32452: 26.1; gnutls_try_handshake maxes out cpu retrying when server is a bit busy
Date: Tue, 1 Mar 2022 10:27:12 -0800 [thread overview]
Message-ID: <d0cfd485-2be6-5873-64dc-2926c2f2bae0__10821.8020106264$1646159300$gmane$org@cs.ucla.edu> (raw)
In-Reply-To: <87a6e9n0rg.fsf@gnus.org>
[-- Attachment #1: Type: text/plain, Size: 535 bytes --]
On 3/1/22 07:36, Lars Ingebrigtsen wrote:
> My latest attempt wasn't from a bare checkout -- it was from my normal
> development tree, though.
Well, that's annoying. :-)
I looked into the problem some more and found what I think is the
underlying problem: gnulib-tool generated lib/gnulib.mk.in before it
generates m4/gnulib-comp.m4, which Makefile-generation relies upon. I
reverted my recent hack to emacs/admin/merge-gnulib and installed the
attached Gnulib patch. Please update to the latest Emacs and Gnulib and
try again.
[-- Attachment #2: 0001-Create-lib-Makefile.am-after-gnulib-comp.m4.patch --]
[-- Type: text/x-patch, Size: 4345 bytes --]
From 8c4f4d7a3c28f88b64fce2fb1d0dc0e570d1a482 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 1 Mar 2022 10:01:22 -0800
Subject: [PATCH] Create lib/Makefile.am after gnulib-comp.m4
* gnulib-tool (func_import): Create library makefile after
creating gnulib-comp.m4. With --gnu-make, the latter depends on
the former. See <https://bugs.gnu.org/32452#109>.
---
ChangeLog | 7 ++++++
gnulib-tool | 68 +++++++++++++++++++++++++++--------------------------
2 files changed, 42 insertions(+), 33 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 629ec803fd..c5a80fd3f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-03-01 Paul Eggert <eggert@cs.ucla.edu>
+
+ Create lib/Makefile.am after gnulib-comp.m4
+ * gnulib-tool (func_import): Create library makefile after
+ creating gnulib-comp.m4. With --gnu-make, the latter depends on
+ the former. See <https://bugs.gnu.org/32452#109>.
+
2022-02-26 Paul Eggert <eggert@cs.ucla.edu>
gettime-res: fix unlikely overflow bug
diff --git a/gnulib-tool b/gnulib-tool
index 9ee7560209..e420b321d2 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -5692,39 +5692,6 @@ s,//*$,/,'
func_note_Makefile_am_edit "$dir1" EXTRA_DIST "${dir2}gnulib-cache.m4"
}
- # Create library makefile.
- func_dest_tmpfilename $sourcebase/$source_makefile_am
- destfile="$sourcebase/$source_makefile_am"
- modules="$main_modules"
- if $automake_subdir; then
- func_emit_lib_Makefile_am | "$gnulib_dir"/build-aux/prefix-gnulib-mk --from-gnulib-tool --lib-name="$libname" --prefix="$sourcebase/" > "$tmpfile"
- else
- func_emit_lib_Makefile_am > "$tmpfile"
- fi
- if test -f "$destdir"/$sourcebase/$source_makefile_am; then
- if cmp -s "$destdir"/$sourcebase/$source_makefile_am "$tmpfile"; then
- rm -f "$tmpfile"
- else
- if $doit; then
- echo "Updating $sourcebase/$source_makefile_am (backup in $sourcebase/$source_makefile_am~)"
- mv -f "$destdir"/$sourcebase/$source_makefile_am "$destdir"/$sourcebase/$source_makefile_am~
- mv -f "$tmpfile" "$destdir"/$sourcebase/$source_makefile_am
- else
- echo "Update $sourcebase/$source_makefile_am (backup in $sourcebase/$source_makefile_am~)"
- rm -f "$tmpfile"
- fi
- fi
- else
- if $doit; then
- echo "Creating $sourcebase/$source_makefile_am"
- mv -f "$tmpfile" "$destdir"/$sourcebase/$source_makefile_am
- else
- echo "Create $sourcebase/$source_makefile_am"
- rm -f "$tmpfile"
- fi
- func_append added_files "$sourcebase/$source_makefile_am$nl"
- fi
-
# Create po/ directory.
if test -n "$pobase"; then
# Create po makefile and auxiliary files.
@@ -6131,6 +6098,41 @@ s,//*$,/,'
fi
fi
+ # Create library makefile.
+ # Do this after creating gnulib-comp.m4, because func_emit_lib_Makefile_am
+ # can run 'autoconf -t', which reads gnulib-comp.m4.
+ func_dest_tmpfilename $sourcebase/$source_makefile_am
+ destfile="$sourcebase/$source_makefile_am"
+ modules="$main_modules"
+ if $automake_subdir; then
+ func_emit_lib_Makefile_am | "$gnulib_dir"/build-aux/prefix-gnulib-mk --from-gnulib-tool --lib-name="$libname" --prefix="$sourcebase/" > "$tmpfile"
+ else
+ func_emit_lib_Makefile_am > "$tmpfile"
+ fi
+ if test -f "$destdir"/$sourcebase/$source_makefile_am; then
+ if cmp -s "$destdir"/$sourcebase/$source_makefile_am "$tmpfile"; then
+ rm -f "$tmpfile"
+ else
+ if $doit; then
+ echo "Updating $sourcebase/$source_makefile_am (backup in $sourcebase/$source_makefile_am~)"
+ mv -f "$destdir"/$sourcebase/$source_makefile_am "$destdir"/$sourcebase/$source_makefile_am~
+ mv -f "$tmpfile" "$destdir"/$sourcebase/$source_makefile_am
+ else
+ echo "Update $sourcebase/$source_makefile_am (backup in $sourcebase/$source_makefile_am~)"
+ rm -f "$tmpfile"
+ fi
+ fi
+ else
+ if $doit; then
+ echo "Creating $sourcebase/$source_makefile_am"
+ mv -f "$tmpfile" "$destdir"/$sourcebase/$source_makefile_am
+ else
+ echo "Create $sourcebase/$source_makefile_am"
+ rm -f "$tmpfile"
+ fi
+ func_append added_files "$sourcebase/$source_makefile_am$nl"
+ fi
+
if $gentests; then
# Create tests makefile.
func_dest_tmpfilename $testsbase/$tests_makefile_am
--
2.32.0
next prev parent reply other threads:[~2022-03-01 18:27 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-16 12:13 bug#32452: 26.1; gnutls_try_handshake maxes out cpu retrying when server is a bit busy Noam Postavsky
2018-08-16 12:49 ` Noam Postavsky
2018-08-16 13:41 ` Eli Zaretskii
2018-08-16 14:45 ` Noam Postavsky
2018-08-16 17:33 ` Eli Zaretskii
2018-08-17 1:02 ` Noam Postavsky
2018-08-17 5:59 ` Eli Zaretskii
2018-08-17 11:55 ` Noam Postavsky
2018-08-17 12:25 ` Eli Zaretskii
2018-08-17 22:10 ` Noam Postavsky
2018-08-18 6:34 ` Eli Zaretskii
2018-08-21 0:52 ` Noam Postavsky
2018-08-21 2:42 ` Eli Zaretskii
2022-02-21 15:20 ` Lars Ingebrigtsen
2022-02-23 19:45 ` Paul Eggert
2022-02-23 19:48 ` Lars Ingebrigtsen
2022-02-23 22:29 ` Paul Eggert
2022-02-23 22:40 ` Lars Ingebrigtsen
2022-02-24 3:09 ` Paul Eggert
2022-02-24 8:57 ` Lars Ingebrigtsen
2022-02-24 18:20 ` Paul Eggert
2022-02-25 2:19 ` Lars Ingebrigtsen
2022-02-25 2:27 ` Lars Ingebrigtsen
2022-02-25 20:41 ` Paul Eggert
[not found] ` <6f364184-7fa8-04f3-44a9-22ce40b872e8@cs.ucla.edu>
2022-02-26 15:12 ` Lars Ingebrigtsen
2022-02-26 15:37 ` Eli Zaretskii
[not found] ` <83ee3pprkr.fsf@gnu.org>
2022-02-26 16:04 ` Lars Ingebrigtsen
[not found] ` <87pmn9txzo.fsf@gnus.org>
2022-02-28 8:59 ` Lars Ingebrigtsen
[not found] ` <87ee3ns6x0.fsf@gnus.org>
2022-02-28 12:28 ` Eli Zaretskii
[not found] ` <83y21vmaye.fsf@gnu.org>
2022-02-28 12:31 ` Lars Ingebrigtsen
2022-02-28 12:35 ` Lars Ingebrigtsen
[not found] ` <877d9fnp7g.fsf@gnus.org>
2022-02-28 12:46 ` Eli Zaretskii
2022-02-28 21:47 ` Paul Eggert
[not found] ` <78c5037a-ac96-e7be-532f-b1776ed25b2b@cs.ucla.edu>
2022-03-01 15:36 ` Lars Ingebrigtsen
[not found] ` <87a6e9n0rg.fsf@gnus.org>
2022-03-01 18:27 ` Paul Eggert [this message]
[not found] ` <d0cfd485-2be6-5873-64dc-2926c2f2bae0@cs.ucla.edu>
2022-03-01 18:52 ` Lars Ingebrigtsen
[not found] ` <87czj5ld38.fsf@gnus.org>
2022-03-02 1:00 ` Paul Eggert
[not found] ` <d24b1278-1aeb-e17d-ed06-7d36c5e3b68b@cs.ucla.edu>
2022-03-02 1:22 ` Lars Ingebrigtsen
2022-03-02 1:43 ` Lars Ingebrigtsen
[not found] ` <87y21tjggy.fsf@gnus.org>
2022-03-02 2:12 ` Paul Eggert
[not found] ` <ab47871e-ad1e-e06d-c226-ab7b7c9bb857@cs.ucla.edu>
2022-03-03 13:46 ` Lars Ingebrigtsen
2022-03-03 13:49 ` Lars Ingebrigtsen
[not found] ` <87czj3jgdd.fsf@gnus.org>
2022-03-03 15:11 ` Eli Zaretskii
2022-03-04 15:28 ` Lars Ingebrigtsen
2022-03-04 16:47 ` Lars Ingebrigtsen
2022-03-04 19:46 ` Eli Zaretskii
2022-03-05 17:11 ` Lars Ingebrigtsen
2022-03-05 17:47 ` Eli Zaretskii
2022-03-05 18:06 ` Lars Ingebrigtsen
2022-03-09 3:01 ` Paul Eggert
[not found] ` <87h78fjgi7.fsf@gnus.org>
2022-03-03 21:40 ` Paul Eggert
[not found] ` <0756f1bd-1348-84ef-4eb8-4cc25eacf1dd@cs.ucla.edu>
2022-03-04 15:31 ` Lars Ingebrigtsen
2019-09-24 5:39 ` Lars Ingebrigtsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='d0cfd485-2be6-5873-64dc-2926c2f2bae0__10821.8020106264$1646159300$gmane$org@cs.ucla.edu' \
--to=eggert@cs.ucla.edu \
--cc=32452@debbugs.gnu.org \
--cc=bug-gnulib@gnu.org \
--cc=larsi@gnus.org \
--cc=npostavs@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).