curl: fix ipv6 detection compile error in configure script

This commit is contained in:
annalee 2023-12-29 06:37:00 +00:00
parent d20560a3ad
commit 84563fcd99
No known key found for this signature in database
2 changed files with 52 additions and 0 deletions

View File

@ -0,0 +1,46 @@
diff --git a/configure b/configure
index 04d1de1..5de1b41 100755
--- a/configure
+++ b/configure
@@ -24949,15 +24949,12 @@ else $as_nop
# include <netinet/in6.h>
#endif
#endif
-#include <stdlib.h> /* for exit() */
-main()
+
+int main(void)
{
struct sockaddr_in6 s;
(void)s;
- if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
- exit(1);
- else
- exit(0);
+ return socket(AF_INET6, SOCK_STREAM, 0) < 0;
}
diff --git a/configure.ac b/configure.ac
index 2d71c83..bd38dd9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1679,15 +1679,12 @@ AS_HELP_STRING([--disable-ipv6],[Disable IPv6 support]),
# include <netinet/in6.h>
#endif
#endif
-#include <stdlib.h> /* for exit() */
-main()
+
+int main(void)
{
struct sockaddr_in6 s;
(void)s;
- if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
- exit(1);
- else
- exit(0);
+ return socket(AF_INET6, SOCK_STREAM, 0) < 0;
}
]])
],

View File

@ -57,6 +57,12 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-FsYqnErw9wPSi9pte783ukcFWtNBTXDexj4uYzbyqC0=";
};
patches = [
# fix ipv6 autodetect compile error in configure script
# remove once https://github.com/curl/curl/pull/12607 released (8.6.0)
./configure-ipv6-autodetect.diff
];
outputs = [ "bin" "dev" "out" "man" "devdoc" ];
separateDebugInfo = stdenv.isLinux;