Skip to content

Commit 2a4fd81

Browse files
committed
Run configure on macos and linux
./configure --disable-ipv6 --without-quiche --without-nghttp2 --without-nghttp3 --without-ngtcp2 --without-librtmp --without-ca-bundle --without-brotli --without-zstd --with-mbedtls --disable-ldap --disable-manual --disable-alt-svc --disable-hsts --disable-rtsp --without-zlib --disable-ntlm-wb --disable-headers-api
1 parent 06acf63 commit 2a4fd81

File tree

3 files changed

+53
-10
lines changed

3 files changed

+53
-10
lines changed

vendor/curl/lib/config-linux.h

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
/* to disable Gopher */
4444
/* #undef CURL_DISABLE_GOPHER */
4545

46+
/* disable headers-api */
47+
/* #undef CURL_DISABLE_HEADERS_API */
48+
4649
/* disable alt-svc */
4750
#define CURL_DISABLE_HSTS 1
4851

@@ -151,6 +154,9 @@
151154
/* Define to 1 if you have the <assert.h> header file. */
152155
#define HAVE_ASSERT_H 1
153156

157+
/* Define to 1 if you have _Atomic support. */
158+
#define HAVE_ATOMIC 1
159+
154160
/* Define to 1 if you have the basename function. */
155161
#define HAVE_BASENAME 1
156162

@@ -200,6 +206,9 @@
200206
/* Define to 1 if you have the <err.h> header file. */
201207
/* #undef HAVE_ERR_H */
202208

209+
/* Define to 1 if you have the `fchmod' function. */
210+
#define HAVE_FCHMOD 1
211+
203212
/* Define to 1 if you have the fcntl function. */
204213
#define HAVE_FCNTL 1
205214

@@ -447,6 +456,9 @@
447456
/* Define to 1 if you have the MSG_NOSIGNAL flag. */
448457
#define HAVE_MSG_NOSIGNAL 1
449458

459+
/* Define to 1 if you have the <msh3.h> header file. */
460+
/* #undef HAVE_MSH3_H */
461+
450462
/* Define to 1 if you have the <netdb.h> header file. */
451463
#define HAVE_NETDB_H 1
452464

@@ -459,6 +471,9 @@
459471
/* Define to 1 if you have the <netinet/tcp.h> header file. */
460472
#define HAVE_NETINET_TCP_H 1
461473

474+
/* Define to 1 if you have the <netinet/udp.h> header file. */
475+
#define HAVE_NETINET_UDP_H 1
476+
462477
/* Define to 1 if you have the <net/if.h> header file. */
463478
#define HAVE_NET_IF_H 1
464479

@@ -548,12 +563,18 @@
548563
/* Define to 1 if you have the <rsa.h> header file. */
549564
/* #undef HAVE_RSA_H */
550565

566+
/* Define to 1 if you have the `sched_yield' function. */
567+
#define HAVE_SCHED_YIELD 1
568+
551569
/* Define to 1 if you have the select function. */
552570
#define HAVE_SELECT 1
553571

554572
/* Define to 1 if you have the send function. */
555573
#define HAVE_SEND 1
556574

575+
/* Define to 1 if you have the `sendmsg' function. */
576+
#define HAVE_SENDMSG 1
577+
557578
/* Define to 1 if you have the <setjmp.h> header file. */
558579
#define HAVE_SETJMP_H 1
559580

@@ -961,6 +982,9 @@
961982
/* if mbedTLS is enabled */
962983
/* #undef USE_MBEDTLS */
963984

985+
/* if msh3 is in use */
986+
/* #undef USE_MSH3 */
987+
964988
/* if nghttp2 is in use */
965989
/* #undef USE_NGHTTP2 */
966990

vendor/curl/lib/config-macos.h

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
/* to disable Gopher */
4444
/* #undef CURL_DISABLE_GOPHER */
4545

46+
/* disable headers-api */
47+
/* #undef CURL_DISABLE_HEADERS_API */
48+
4649
/* disable alt-svc */
4750
#define CURL_DISABLE_HSTS 1
4851

@@ -151,6 +154,9 @@
151154
/* Define to 1 if you have the <assert.h> header file. */
152155
#define HAVE_ASSERT_H 1
153156

157+
/* Define to 1 if you have _Atomic support. */
158+
#define HAVE_ATOMIC 1
159+
154160
/* Define to 1 if you have the basename function. */
155161
#define HAVE_BASENAME 1
156162

@@ -200,6 +206,9 @@
200206
/* Define to 1 if you have the <err.h> header file. */
201207
/* #undef HAVE_ERR_H */
202208

209+
/* Define to 1 if you have the `fchmod' function. */
210+
#define HAVE_FCHMOD 1
211+
203212
/* Define to 1 if you have the fcntl function. */
204213
#define HAVE_FCNTL 1
205214

@@ -445,7 +454,10 @@
445454
/* #undef HAVE_MEMRCHR */
446455

447456
/* Define to 1 if you have the MSG_NOSIGNAL flag. */
448-
/* #undef HAVE_MSG_NOSIGNAL */
457+
#define HAVE_MSG_NOSIGNAL 1
458+
459+
/* Define to 1 if you have the <msh3.h> header file. */
460+
/* #undef HAVE_MSH3_H */
449461

450462
/* Define to 1 if you have the <netdb.h> header file. */
451463
#define HAVE_NETDB_H 1
@@ -459,6 +471,9 @@
459471
/* Define to 1 if you have the <netinet/tcp.h> header file. */
460472
#define HAVE_NETINET_TCP_H 1
461473

474+
/* Define to 1 if you have the <netinet/udp.h> header file. */
475+
#define HAVE_NETINET_UDP_H 1
476+
462477
/* Define to 1 if you have the <net/if.h> header file. */
463478
#define HAVE_NET_IF_H 1
464479

@@ -548,12 +563,18 @@
548563
/* Define to 1 if you have the <rsa.h> header file. */
549564
/* #undef HAVE_RSA_H */
550565

566+
/* Define to 1 if you have the `sched_yield' function. */
567+
#define HAVE_SCHED_YIELD 1
568+
551569
/* Define to 1 if you have the select function. */
552570
#define HAVE_SELECT 1
553571

554572
/* Define to 1 if you have the send function. */
555573
#define HAVE_SEND 1
556574

575+
/* Define to 1 if you have the `sendmsg' function. */
576+
#define HAVE_SENDMSG 1
577+
557578
/* Define to 1 if you have the <setjmp.h> header file. */
558579
#define HAVE_SETJMP_H 1
559580

@@ -816,7 +837,7 @@
816837
/* #undef NTLM_WB_FILE */
817838

818839
/* cpu-machine-OS */
819-
#define OS "x86_64-apple-darwin21.4.0"
840+
#define OS "x86_64-apple-darwin20.6.0"
820841

821842
/* Name of package */
822843
#define PACKAGE "curl"
@@ -858,7 +879,7 @@
858879
#define RECV_TYPE_RETV ssize_t
859880

860881
/* Define to the type qualifier of arg 5 for select. */
861-
#define SELECT_QUAL_ARG5
882+
#define SELECT_QUAL_ARG5
862883

863884
/* Define to the type of arg 1 for select. */
864885
#define SELECT_TYPE_ARG1 int
@@ -961,6 +982,9 @@
961982
/* if mbedTLS is enabled */
962983
/* #undef USE_MBEDTLS */
963984

985+
/* if msh3 is in use */
986+
/* #undef USE_MSH3 */
987+
964988
/* if nghttp2 is in use */
965989
/* #undef USE_NGHTTP2 */
966990

vendor/curl/premake5.lua

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@ project "curl"
2020
"lib/config-dos.h",
2121
"lib/config-mac.h",
2222
"lib/config-os400.h",
23+
"lib/config-plan9.h",
2324
"lib/config-riscos.h",
24-
"lib/config-symbian.h",
25-
"lib/config-tpf.h",
2625
"lib/config-win32ce.h",
27-
"lib/config-vxworks.h",
2826
"lib/setup-os400.h",
2927
"lib/setup-vms.h"
3028
}
@@ -33,10 +31,7 @@ project "curl"
3331
defines { "USE_SCHANNEL", "USE_WINDOWS_SSPI", "USE_WIN32_IDN", "WANT_IDN_PROTOTYPES" }
3432
links { "crypt32", "Normaliz" }
3533

36-
filter { "system:macosx" }
37-
defines { "USE_DARWINSSL" }
38-
39-
filter { "system:not windows", "system:not macosx" }
34+
filter { "system:not windows" }
4035
defines { "USE_MBEDTLS" }
4136

4237
filter { "system:linux or bsd or macosx" }

0 commit comments

Comments
 (0)