mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-08 08:30:47 -09:00
package/wolfssl: fix build with libcurl >= 8.19.0
wolfssl requires definition of SIZEOF_LONG_LONG. Commit3a5e071e4f("package/libcurl: security bump to version 8.19.0") removed SIZEOF_LONG_LONG definitions from libcurl autotools build system, breaking build with wolfssl. Fixes: https://autobuild.buildroot.net/results/baa/baa74a47464ed3e21d0adad64dd0c7c708c9ef85/ Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Julien Olivain <ju.o@free.fr> (cherry picked from commit50feb87384) Signed-off-by: Thomas Perale <thomas.perale@mind.be>
This commit is contained in:
committed by
Thomas Perale
parent
b6474fc1c4
commit
fadcabd086
@@ -0,0 +1,60 @@
|
||||
From b54173fc402c30e81d66b84e2f9725cb6d944b40 Mon Sep 17 00:00:00 2001
|
||||
From: Kareem <kareem@wolfssl.com>
|
||||
Date: Fri, 27 Mar 2026 17:01:02 -0700
|
||||
Subject: [PATCH] Define HAVE_LIMITS_H in options.h rather than config.h since
|
||||
types.h depends on this definition and config.h isn't consistently available
|
||||
at runtime. Fixes #9936.
|
||||
|
||||
Upstream: https://github.com/wolfSSL/wolfssl/pull/10097
|
||||
|
||||
[Bernd: rebased for 5.7.2]
|
||||
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
||||
---
|
||||
cmake/config.in | 3 ---
|
||||
cmake/options.h.in | 3 +++
|
||||
configure.ac | 4 +++-
|
||||
3 files changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/cmake/config.in b/cmake/config.in
|
||||
index f2524e41e43..6054b6dbe7b 100644
|
||||
--- a/cmake/config.in
|
||||
+++ b/cmake/config.in
|
||||
@@ -19,9 +19,6 @@
|
||||
/* Define to 1 if you have the `gmtime_r' function. */
|
||||
#cmakedefine HAVE_GMTIME_R @HAVE_GMTIME_R@
|
||||
|
||||
-/* Define to 1 if you have the <limits.h> header file. */
|
||||
-#cmakedefine HAVE_LIMITS_H @HAVE_LIMITS_H@
|
||||
-
|
||||
/* Define to 1 if you have the <pcap/pcap.h> header file. */
|
||||
#cmakedefine HAVE_PCAP_PCAP_H @HAVE_PCAP_PCAP_H@
|
||||
|
||||
diff --git a/cmake/options.h.in b/cmake/options.h.in
|
||||
index 985b54241d6..c46ada8045d 100644
|
||||
--- a/cmake/options.h.in
|
||||
+++ b/cmake/options.h.in
|
||||
@@ -31,6 +31,9 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
#ifndef WOLFSSL_OPTIONS_IGNORE_SYS
|
||||
+/* Since types.h depends on HAVE_LIMITS_H, we must define it in options.h. */
|
||||
+#undef HAVE_LIMITS_H
|
||||
+#cmakedefine HAVE_LIMITS_H @HAVE_LIMITS_H@
|
||||
#undef _GNU_SOURCE
|
||||
#cmakedefine _GNU_SOURCE
|
||||
#undef _POSIX_THREADS
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index bce600f2ecc..c5cf9f320c7 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -116,7 +116,9 @@
|
||||
AM_CCASFLAGS="$AM_CCASFLAGS -DWOLFSSL_EXPERIMENTAL_SETTINGS"
|
||||
fi
|
||||
|
||||
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stddef.h time.h sys/ioctl.h sys/socket.h sys/time.h errno.h sys/un.h])
|
||||
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stddef.h time.h sys/ioctl.h sys/socket.h sys/time.h errno.h sys/un.h])
|
||||
+# Special case: Since types.h depends on HAVE_LIMITS_H, we must define it in options.h.
|
||||
+AC_CHECK_HEADER([limits.h], [AM_CPPFLAGS="$AM_CPPFLAGS -DHAVE_LIMITS_H=1"], [])
|
||||
AC_CHECK_LIB([network],[socket])
|
||||
AC_C_BIGENDIAN
|
||||
AC_C___ATOMIC
|
||||
Reference in New Issue
Block a user