bug#32452: 26.1; gnutls_try_handshake maxes out cpu retrying when server is a bit busy

[Lars Ingebrigtsen]

Paul Eggert <eggert@cs.ucla.edu> writes:

> On 2/23/22 14:40, Lars Ingebrigtsen wrote:
>>     MOSTLYCLEANFILES += core *.stackdump
>>   # Start of GNU Make output.
>> -ALLOCA = @ALLOCA@
>> -ALLOCA_H = @ALLOCA_H@
>
> That means something went wrong. It looks like you're using a mixture
> of the old and new somehow. You might try removing autom4te.cache and
> re-running admin/merge-gnulib.

The problem was that I was running admin/merge-gnulib from a fresh
checkout -- you have to run (at least) autogen.sh first.  Perhaps that
should be noted in admin/notes/repo, or possibly fixed in the
merge-gnulib script?

In any case, if I do that now, I get a diff that's just a single line:

diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in
index 6b90a80f64..3a9f5b9818 100644
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -207,7 +207,6 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOLIB = @CRYPTOLIB@
 CXX = @CXX@
-CXXCPP = @CXXCPP@
 CXXFLAGS = @CXXFLAGS@
 CYGWIN_OBJ = @CYGWIN_OBJ@
 C_SWITCH_MACHINE = @C_SWITCH_MACHINE@


-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no