Re: ☠ Buildbot (GNU Toolchain): elfutils - failed compile (failure) (master)

[Mark Wielaard <mark@klomp.org>]

[-- Attachment #1: Type: text/plain, Size: 789 bytes --]

On Wed, 2022-12-21 at 17:04 +0000, builder--- via Elfutils-devel wrote:
> A new failure has been detected on builder elfutils-centos-x86_64
> while building elfutils.
> 
> Full details are available at:
>     https://builder.sourceware.org/buildbot/#builders/39/builds/117
> 
> Build state: failed compile (failure)
> Revision: d2bf497b12fbd49b4996ccf0744303ffd67735b1
> Worker: centos-x86_64
> Build Reason: (unknown)
> Blamelist: Andrew Paprocki <andrew@ishiboo.com>
> 
> Steps:
> [...]
> - 6: make ( failure )
>     Logs:
>         - stdio: 
> https://builder.sourceware.org/buildbot/#builders/39/builds/117/steps/6/logs/stdio

Oops, we need a version check to see if CURL_AT_LEAST_VERSION is
available... doh.

Fixed with the attached patch.

Cheers,

Mark

[-- Attachment #2: 0001-debuginfod-Define-CURL_AT_LEAST_VERSION-if-necessary.patch --]
[-- Type: text/x-patch, Size: 1540 bytes --]

From 304741e11018c29e7ff17751e05dcc5c786a3fd9 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@klomp.org>
Date: Wed, 21 Dec 2022 18:21:08 +0100
Subject: [PATCH] debuginfod: Define CURL_AT_LEAST_VERSION if necessary

Older curl.h don't define CURL_AT_LEAST_VERSION, so define it
ourselves because it is nicer than doing hex encoded version
comparisons.

Signed-off-by: Mark Wielaard <mark@klomp.org>
---
 debuginfod/ChangeLog           | 4 ++++
 debuginfod/debuginfod-client.c | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog
index 2c65d862..2ddb7ca0 100644
--- a/debuginfod/ChangeLog
+++ b/debuginfod/ChangeLog
@@ -1,3 +1,7 @@
+2022-12-21  Mark Wielaard  <mark@klomp.org>
+
+	* debuginfod-client.c: Define CURL_AT_LEAST_VERSION.
+
 2022-12-21  Andrew Paprocki  <andrew@ishiboo.com>
 
 	* debuginfod-client.c: Make compilable against newer curl.  PR29926
diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
index 692aecce..a16165bd 100644
--- a/debuginfod/debuginfod-client.c
+++ b/debuginfod/debuginfod-client.c
@@ -105,6 +105,13 @@ void debuginfod_end (debuginfod_client *c) { }
   #include <fts.h>
 #endif
 
+/* Older curl.h don't define CURL_AT_LEAST_VERSION.  */
+#ifndef CURL_AT_LEAST_VERSION
+  #define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|(z))
+  #define CURL_AT_LEAST_VERSION(x,y,z) \
+    (LIBCURL_VERSION_NUM >= CURL_VERSION_BITS(x, y, z))
+#endif
+
 #include <pthread.h>
 
 static pthread_once_t init_control = PTHREAD_ONCE_INIT;
-- 
2.18.4