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: Mon, 28 Feb 2022 13:47:03 -0800 [thread overview]
Message-ID: <78c5037a-ac96-e7be-532f-b1776ed25b2b__11080.6992788397$1646084898$gmane$org@cs.ucla.edu> (raw)
In-Reply-To: <87ee3ns6x0.fsf@gnus.org>
[-- Attachment #1: Type: text/plain, Size: 891 bytes --]
On 2/28/22 00:59, Lars Ingebrigtsen wrote:
> /usr/bin/ld: gnutls.o: in function `gnutls_try_handshake':
> /home/larsi/src/emacs/trunk/src/gnutls.c:634: undefined reference to `rpl_nanosleep'
Evidently my recent workarounds in Emacs to handle running gnulib-tool
from a bare checkout were not sufficient. I installed the attached patch
to up the ante; please give it a try.
It is unfortunate that emacs/admin/merge-gnulib now runs gnulib-tool
twice from a bare checkout, as gnulib-tool is quite slow.
I think gnulib-tool needs to run twice because it builds
emacs/lib/gnulib.mk.in before it builds emacs/m4/gnulib-comp.m4, and so
doesn't use the newly-added emacs/m4/nanosleep.m4 to figure out the new
X=@X@ lines that needed to be added to emacs/lib/gnulib.mk.in. I suspect
that this is related to Emacs's using Gnu Make rather than Automake.
However, I haven't debugged this out.
[-- Attachment #2: 0001-Work-around-merge-gnulib-glitch-from-fresh-checkout.patch --]
[-- Type: text/x-patch, Size: 2854 bytes --]
From d150eb438baa62ef3965ef4dc1f9f342ed839a18 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 28 Feb 2022 13:16:44 -0800
Subject: [PATCH] Work around merge-gnulib glitch from fresh checkout
* admin/merge-gnulib: In a fresh checkout, run gnulib-tool
twice, instead of merely running autogen.sh twice.
---
admin/merge-gnulib | 54 +++++++++++++++++++++++++++-------------------
1 file changed, 32 insertions(+), 22 deletions(-)
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index fec469c017..7219fadd47 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -102,34 +102,44 @@ gnulib_srcdir=
exit 1
}
-# gnulib-tool has problems with a bare checkout (Bug#32452#65).
-test -f configure || ./autogen.sh || exit
-
# Old caches can confuse autoconf when some Gnulib-related changes take effect.
rm -fr autom4te.cache || exit
+# gnulib-tool has problems with a bare checkout (Bug#32452#91).
+if test -f configure; then
+ passes='1'
+else
+ passes='1 2'
+fi
+
avoided_flags=
for module in $AVOIDED_MODULES; do
avoided_flags="$avoided_flags --avoid=$module"
done
-"$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS \
+for pass in $passes; do
+ case $pass in
+ 2) echo 'Running gnulib-tool again to work around Bug#32452#91.' >&2
+ esac
+
+ "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS \
$avoided_flags $GNULIB_MODULES &&
-rm -- "$src"lib/gl_openssl.h \
- "$src"lib/stdio-read.c "$src"lib/stdio-write.c \
- "$src"m4/fcntl-o.m4 \
- "$src"m4/gl-openssl.m4 \
- "$src"m4/gnulib-cache.m4 "$src"m4/gnulib-tool.m4 \
- "$src"m4/manywarnings-c++.m4 \
- "$src"m4/warn-on-use.m4 "$src"m4/wint_t.m4 &&
-cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc &&
-cp -- "$gnulib_srcdir"/build-aux/config.guess \
- "$gnulib_srcdir"/build-aux/config.sub \
- "$gnulib_srcdir"/build-aux/install-sh \
- "$gnulib_srcdir"/build-aux/move-if-change \
- "$src"build-aux &&
-cp -- "$gnulib_srcdir"/lib/af_alg.h \
- "$gnulib_srcdir"/lib/save-cwd.h \
- "$src"lib &&
-{ test -z "$src" || cd "$src"; } &&
-./autogen.sh
+ rm -- "$src"lib/gl_openssl.h \
+ "$src"lib/stdio-read.c "$src"lib/stdio-write.c \
+ "$src"m4/fcntl-o.m4 \
+ "$src"m4/gl-openssl.m4 \
+ "$src"m4/gnulib-cache.m4 "$src"m4/gnulib-tool.m4 \
+ "$src"m4/manywarnings-c++.m4 \
+ "$src"m4/warn-on-use.m4 "$src"m4/wint_t.m4 &&
+ cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc &&
+ cp -- "$gnulib_srcdir"/build-aux/config.guess \
+ "$gnulib_srcdir"/build-aux/config.sub \
+ "$gnulib_srcdir"/build-aux/install-sh \
+ "$gnulib_srcdir"/build-aux/move-if-change \
+ "$src"build-aux &&
+ cp -- "$gnulib_srcdir"/lib/af_alg.h \
+ "$gnulib_srcdir"/lib/save-cwd.h \
+ "$src"lib &&
+ { test -z "$src" || cd "$src"; } &&
+ ./autogen.sh || exit
+done
--
2.32.0
next prev parent reply other threads:[~2022-02-28 21:47 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 [this message]
[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
[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='78c5037a-ac96-e7be-532f-b1776ed25b2b__11080.6992788397$1646084898$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).