Skip to content
This repository was archived by the owner on Jul 31, 2023. It is now read-only.

Commit 68c05e3

Browse files
author
Ian Sturdy
authored
Fix the curl build on os x. (#147)
1 parent 042603a commit 68c05e3

File tree

2 files changed

+179
-169
lines changed

2 files changed

+179
-169
lines changed

‎WORKSPACE‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,12 @@ config_setting(
121121
visibility = [ "//visibility:private" ],
122122
)
123123
124+
config_setting(
125+
name = "osx",
126+
values = {"cpu": "darwin"},
127+
visibility = [ "//visibility:private" ],
128+
)
129+
124130
cc_library(
125131
name = "curl",
126132
srcs = glob([

‎opencensus/curl.bzl‎

Lines changed: 173 additions & 169 deletions
Original file line numberDiff line numberDiff line change
@@ -14,179 +14,183 @@
1414

1515
# Compiler options for building libcurl.
1616

17+
BASE_CURL_COPTS = [
18+
# Disable everything else except HTTP protocol.
19+
"-DHTTP_ONLY=1",
20+
21+
"-DENABLE_IPV6=1",
22+
"-DGETHOSTNAME_TYPE_ARG2=size_t",
23+
"-DGETSERVBYPORT_R_ARGS=6",
24+
"-DGETSERVBYPORT_R_BUFSIZE=4096",
25+
"-DHAVE_ALARM=1",
26+
"-DHAVE_ALLOCA_H=1",
27+
"-DHAVE_ARPA_INET_H=1",
28+
"-DHAVE_ARPA_TFTP_H=1",
29+
"-DHAVE_ASSERT_H=1",
30+
"-DHAVE_BASENAME=1",
31+
"-DHAVE_BOOL_T=1",
32+
"-DHAVE_CLOCK_GETTIME_MONOTONIC=1",
33+
"-DHAVE_CONNECT=1",
34+
"-DHAVE_DLFCN_H=1",
35+
"-DHAVE_ENGINE_LOAD_BUILTIN_ENGINES=1",
36+
"-DHAVE_ERRNO_H=1",
37+
"-DHAVE_FCNTL=1",
38+
"-DHAVE_FCNTL_H=1",
39+
"-DHAVE_FCNTL_O_NONBLOCK=1",
40+
"-DHAVE_FDOPEN=1",
41+
"-DHAVE_FREEADDRINFO=1",
42+
"-DHAVE_FREEIFADDRS=1",
43+
"-DHAVE_FSETXATTR=1",
44+
"-DHAVE_FSETXATTR_5=1",
45+
"-DHAVE_FTRUNCATE=1",
46+
"-DHAVE_GAI_STRERROR=1",
47+
"-DHAVE_GETADDRINFO=1",
48+
"-DHAVE_GETADDRINFO_THREADSAFE=1",
49+
"-DHAVE_GETEUID=1",
50+
"-DHAVE_GETHOSTBYADDR=1",
51+
"-DHAVE_GETHOSTBYADDR_R=1",
52+
"-DHAVE_GETHOSTBYADDR_R_8=1",
53+
"-DHAVE_GETHOSTBYNAME=1",
54+
"-DHAVE_GETHOSTBYNAME_R=1",
55+
"-DHAVE_GETHOSTBYNAME_R_6=1",
56+
"-DHAVE_GETHOSTNAME=1",
57+
"-DHAVE_GETIFADDRS=1",
58+
"-DHAVE_GETNAMEINFO=1",
59+
"-DHAVE_GETPPID=1",
60+
"-DHAVE_GETPWUID=1",
61+
"-DHAVE_GETPWUID_R=1",
62+
"-DHAVE_GETRLIMIT=1",
63+
"-DHAVE_GETSERVBYPORT_R=1",
64+
"-DHAVE_GETTIMEOFDAY=1",
65+
"-DHAVE_GMTIME_R=1",
66+
"-DHAVE_IFADDRS_H=1",
67+
"-DHAVE_IF_NAMETOINDEX=1",
68+
"-DHAVE_INET_NTOP=1",
69+
"-DHAVE_INET_PTON=1",
70+
"-DHAVE_INTTYPES_H=1",
71+
"-DHAVE_IOCTL=1",
72+
"-DHAVE_IOCTL_FIONBIO=1",
73+
"-DHAVE_IOCTL_SIOCGIFADDR=1",
74+
"-DHAVE_LIBGEN_H=1",
75+
"-DHAVE_LL=1",
76+
"-DHAVE_LOCALE_H=1",
77+
"-DHAVE_LOCALTIME_R=1",
78+
"-DHAVE_LONGLONG=1",
79+
"-DHAVE_MALLOC_H=1",
80+
"-DHAVE_MEMORY_H=1",
81+
"-DHAVE_NETDB_H=1",
82+
"-DHAVE_NETINET_IN_H=1",
83+
"-DHAVE_NETINET_TCP_H=1",
84+
"-DHAVE_NET_IF_H=1",
85+
"-DHAVE_PIPE=1",
86+
"-DHAVE_POLL=1",
87+
"-DHAVE_POLL_FINE=1",
88+
"-DHAVE_POLL_H=1",
89+
"-DHAVE_POSIX_STRERROR_R=1",
90+
"-DHAVE_PTHREAD_H=1",
91+
"-DHAVE_PWD_H=1",
92+
"-DHAVE_RECV=1",
93+
"-DHAVE_SELECT=1",
94+
"-DHAVE_SEND=1",
95+
"-DHAVE_SETJMP_H=1",
96+
"-DHAVE_SETLOCALE=1",
97+
"-DHAVE_SETRLIMIT=1",
98+
"-DHAVE_SETSOCKOPT=1",
99+
"-DHAVE_SGTTY_H=1",
100+
"-DHAVE_SIGACTION=1",
101+
"-DHAVE_SIGINTERRUPT=1",
102+
"-DHAVE_SIGNAL=1",
103+
"-DHAVE_SIGNAL_H=1",
104+
"-DHAVE_SIGSETJMP=1",
105+
"-DHAVE_SIG_ATOMIC_T=1",
106+
"-DHAVE_SOCKADDR_IN6_SIN6_SCOPE_ID=1",
107+
"-DHAVE_SOCKET=1",
108+
"-DHAVE_SOCKETPAIR=1",
109+
"-DHAVE_STDBOOL_H=1",
110+
"-DHAVE_STDINT_H=1",
111+
"-DHAVE_STDIO_H=1",
112+
"-DHAVE_STDLIB_H=1",
113+
"-DHAVE_STRCASECMP=1",
114+
"-DHAVE_STRDUP=1",
115+
"-DHAVE_STRERROR_R=1",
116+
"-DHAVE_STRINGS_H=1",
117+
"-DHAVE_STRING_H=1",
118+
"-DHAVE_STRNCASECMP=1",
119+
"-DHAVE_STRSTR=1",
120+
"-DHAVE_STRTOK_R=1",
121+
"-DHAVE_STRTOLL=1",
122+
"-DHAVE_STRUCT_SOCKADDR_STORAGE=1",
123+
"-DHAVE_STRUCT_TIMEVAL=1",
124+
"-DHAVE_SYS_IOCTL_H=1",
125+
"-DHAVE_SYS_PARAM_H=1",
126+
"-DHAVE_SYS_POLL_H=1",
127+
"-DHAVE_SYS_RESOURCE_H=1",
128+
"-DHAVE_SYS_SELECT_H=1",
129+
"-DHAVE_SYS_SOCKET_H=1",
130+
"-DHAVE_SYS_STAT_H=1",
131+
"-DHAVE_SYS_TIME_H=1",
132+
"-DHAVE_SYS_TYPES_H=1",
133+
"-DHAVE_SYS_UIO_H=1",
134+
"-DHAVE_SYS_UN_H=1",
135+
"-DHAVE_SYS_WAIT_H=1",
136+
"-DHAVE_SYS_XATTR_H=1",
137+
"-DHAVE_TERMIOS_H=1",
138+
"-DHAVE_TERMIO_H=1",
139+
"-DHAVE_TIME_H=1",
140+
"-DHAVE_UNISTD_H=1",
141+
"-DHAVE_UTIME=1",
142+
"-DHAVE_UTIMES=1",
143+
"-DHAVE_UTIME_H=1",
144+
"-DHAVE_VARIADIC_MACROS_C99=1",
145+
"-DHAVE_VARIADIC_MACROS_GCC=1",
146+
"-DHAVE_WRITABLE_ARGV=1",
147+
"-DHAVE_WRITEV=1",
148+
"-DRECV_TYPE_ARG1=int",
149+
"-DRECV_TYPE_ARG2=void*",
150+
"-DRECV_TYPE_ARG3=size_t",
151+
"-DRECV_TYPE_ARG4=int",
152+
"-DRECV_TYPE_RETV=ssize_t",
153+
"-DRETSIGTYPE=void",
154+
"-DSELECT_QUAL_ARG5=",
155+
"-DSELECT_TYPE_ARG1=int",
156+
"-DSELECT_TYPE_ARG234=fd_set*",
157+
"-DSELECT_TYPE_RETV=int",
158+
"-DSEND_QUAL_ARG2=const",
159+
"-DSEND_TYPE_ARG1=int",
160+
"-DSEND_TYPE_ARG2=void*",
161+
"-DSEND_TYPE_ARG3=size_t",
162+
"-DSEND_TYPE_ARG4=int",
163+
"-DSEND_TYPE_RETV=ssize_t",
164+
"-DSIZEOF_CURL_OFF_T=8",
165+
"-DSIZEOF_INT=4",
166+
"-DSIZEOF_LONG=8",
167+
"-DSIZEOF_OFF_T=8",
168+
"-DSIZEOF_SHORT=2",
169+
"-DSIZEOF_SIZE_T=8",
170+
"-DSIZEOF_TIME_T=8",
171+
"-DSTDC_HEADERS=1",
172+
"-DSTRERROR_R_TYPE_ARG3=size_t",
173+
"-DTIME_WITH_SYS_TIME=1",
174+
"-DUSE_THREADS_POSIX=1",
175+
"-DUSE_UNIX_SOCKETS=1",
176+
177+
# Extra defines needed by curl
178+
"-DBUILDING_LIBCURL",
179+
"-DCURL_HIDDEN_SYMBOLS",
180+
]
181+
182+
LINUX_CURL_COPTS = [
183+
"-DHAVE_LINUX_TCP_H=1",
184+
"-DHAVE_MSG_NOSIGNAL=1",
185+
"-DHAVE_STROPTS_H=1",
186+
]
187+
17188
CURL_COPTS = select({
18189
# TODO: Add in windows defines
19190
"//:windows": [
20191
# Disable everything else except HTTP protocol.
21192
"-DHTTP_ONLY=1",
22193
],
23-
24-
# Default defines
25-
"//conditions:default": [
26-
# Disable everything else except HTTP protocol.
27-
"-DHTTP_ONLY=1",
28-
29-
"-DENABLE_IPV6=1",
30-
"-DGETHOSTNAME_TYPE_ARG2=size_t",
31-
"-DGETSERVBYPORT_R_ARGS=6",
32-
"-DGETSERVBYPORT_R_BUFSIZE=4096",
33-
"-DHAVE_ALARM=1",
34-
"-DHAVE_ALLOCA_H=1",
35-
"-DHAVE_ARPA_INET_H=1",
36-
"-DHAVE_ARPA_TFTP_H=1",
37-
"-DHAVE_ASSERT_H=1",
38-
"-DHAVE_BASENAME=1",
39-
"-DHAVE_BOOL_T=1",
40-
"-DHAVE_CLOCK_GETTIME_MONOTONIC=1",
41-
"-DHAVE_CONNECT=1",
42-
"-DHAVE_DLFCN_H=1",
43-
"-DHAVE_ENGINE_LOAD_BUILTIN_ENGINES=1",
44-
"-DHAVE_ERRNO_H=1",
45-
"-DHAVE_FCNTL=1",
46-
"-DHAVE_FCNTL_H=1",
47-
"-DHAVE_FCNTL_O_NONBLOCK=1",
48-
"-DHAVE_FDOPEN=1",
49-
"-DHAVE_FREEADDRINFO=1",
50-
"-DHAVE_FREEIFADDRS=1",
51-
"-DHAVE_FSETXATTR=1",
52-
"-DHAVE_FSETXATTR_5=1",
53-
"-DHAVE_FTRUNCATE=1",
54-
"-DHAVE_GAI_STRERROR=1",
55-
"-DHAVE_GETADDRINFO=1",
56-
"-DHAVE_GETADDRINFO_THREADSAFE=1",
57-
"-DHAVE_GETEUID=1",
58-
"-DHAVE_GETHOSTBYADDR=1",
59-
"-DHAVE_GETHOSTBYADDR_R=1",
60-
"-DHAVE_GETHOSTBYADDR_R_8=1",
61-
"-DHAVE_GETHOSTBYNAME=1",
62-
"-DHAVE_GETHOSTBYNAME_R=1",
63-
"-DHAVE_GETHOSTBYNAME_R_6=1",
64-
"-DHAVE_GETHOSTNAME=1",
65-
"-DHAVE_GETIFADDRS=1",
66-
"-DHAVE_GETNAMEINFO=1",
67-
"-DHAVE_GETPPID=1",
68-
"-DHAVE_GETPWUID=1",
69-
"-DHAVE_GETPWUID_R=1",
70-
"-DHAVE_GETRLIMIT=1",
71-
"-DHAVE_GETSERVBYPORT_R=1",
72-
"-DHAVE_GETTIMEOFDAY=1",
73-
"-DHAVE_GMTIME_R=1",
74-
"-DHAVE_IFADDRS_H=1",
75-
"-DHAVE_IF_NAMETOINDEX=1",
76-
"-DHAVE_INET_NTOP=1",
77-
"-DHAVE_INET_PTON=1",
78-
"-DHAVE_INTTYPES_H=1",
79-
"-DHAVE_IOCTL=1",
80-
"-DHAVE_IOCTL_FIONBIO=1",
81-
"-DHAVE_IOCTL_SIOCGIFADDR=1",
82-
"-DHAVE_LIBGEN_H=1",
83-
"-DHAVE_LINUX_TCP_H=1",
84-
"-DHAVE_LL=1",
85-
"-DHAVE_LOCALE_H=1",
86-
"-DHAVE_LOCALTIME_R=1",
87-
"-DHAVE_LONGLONG=1",
88-
"-DHAVE_MALLOC_H=1",
89-
"-DHAVE_MEMORY_H=1",
90-
"-DHAVE_MSG_NOSIGNAL=1",
91-
"-DHAVE_NETDB_H=1",
92-
"-DHAVE_NETINET_IN_H=1",
93-
"-DHAVE_NETINET_TCP_H=1",
94-
"-DHAVE_NET_IF_H=1",
95-
"-DHAVE_PIPE=1",
96-
"-DHAVE_POLL=1",
97-
"-DHAVE_POLL_FINE=1",
98-
"-DHAVE_POLL_H=1",
99-
"-DHAVE_POSIX_STRERROR_R=1",
100-
"-DHAVE_PTHREAD_H=1",
101-
"-DHAVE_PWD_H=1",
102-
"-DHAVE_RECV=1",
103-
"-DHAVE_SELECT=1",
104-
"-DHAVE_SEND=1",
105-
"-DHAVE_SETJMP_H=1",
106-
"-DHAVE_SETLOCALE=1",
107-
"-DHAVE_SETRLIMIT=1",
108-
"-DHAVE_SETSOCKOPT=1",
109-
"-DHAVE_SGTTY_H=1",
110-
"-DHAVE_SIGACTION=1",
111-
"-DHAVE_SIGINTERRUPT=1",
112-
"-DHAVE_SIGNAL=1",
113-
"-DHAVE_SIGNAL_H=1",
114-
"-DHAVE_SIGSETJMP=1",
115-
"-DHAVE_SIG_ATOMIC_T=1",
116-
"-DHAVE_SOCKADDR_IN6_SIN6_SCOPE_ID=1",
117-
"-DHAVE_SOCKET=1",
118-
"-DHAVE_SOCKETPAIR=1",
119-
"-DHAVE_STDBOOL_H=1",
120-
"-DHAVE_STDINT_H=1",
121-
"-DHAVE_STDIO_H=1",
122-
"-DHAVE_STDLIB_H=1",
123-
"-DHAVE_STRCASECMP=1",
124-
"-DHAVE_STRDUP=1",
125-
"-DHAVE_STRERROR_R=1",
126-
"-DHAVE_STRINGS_H=1",
127-
"-DHAVE_STRING_H=1",
128-
"-DHAVE_STRNCASECMP=1",
129-
"-DHAVE_STROPTS_H=1",
130-
"-DHAVE_STRSTR=1",
131-
"-DHAVE_STRTOK_R=1",
132-
"-DHAVE_STRTOLL=1",
133-
"-DHAVE_STRUCT_SOCKADDR_STORAGE=1",
134-
"-DHAVE_STRUCT_TIMEVAL=1",
135-
"-DHAVE_SYS_IOCTL_H=1",
136-
"-DHAVE_SYS_PARAM_H=1",
137-
"-DHAVE_SYS_POLL_H=1",
138-
"-DHAVE_SYS_RESOURCE_H=1",
139-
"-DHAVE_SYS_SELECT_H=1",
140-
"-DHAVE_SYS_SOCKET_H=1",
141-
"-DHAVE_SYS_STAT_H=1",
142-
"-DHAVE_SYS_TIME_H=1",
143-
"-DHAVE_SYS_TYPES_H=1",
144-
"-DHAVE_SYS_UIO_H=1",
145-
"-DHAVE_SYS_UN_H=1",
146-
"-DHAVE_SYS_WAIT_H=1",
147-
"-DHAVE_SYS_XATTR_H=1",
148-
"-DHAVE_TERMIOS_H=1",
149-
"-DHAVE_TERMIO_H=1",
150-
"-DHAVE_TIME_H=1",
151-
"-DHAVE_UNISTD_H=1",
152-
"-DHAVE_UTIME=1",
153-
"-DHAVE_UTIMES=1",
154-
"-DHAVE_UTIME_H=1",
155-
"-DHAVE_VARIADIC_MACROS_C99=1",
156-
"-DHAVE_VARIADIC_MACROS_GCC=1",
157-
"-DHAVE_WRITABLE_ARGV=1",
158-
"-DHAVE_WRITEV=1",
159-
"-DRECV_TYPE_ARG1=int",
160-
"-DRECV_TYPE_ARG2=void*",
161-
"-DRECV_TYPE_ARG3=size_t",
162-
"-DRECV_TYPE_ARG4=int",
163-
"-DRECV_TYPE_RETV=ssize_t",
164-
"-DRETSIGTYPE=void",
165-
"-DSELECT_QUAL_ARG5=",
166-
"-DSELECT_TYPE_ARG1=int",
167-
"-DSELECT_TYPE_ARG234=fd_set*",
168-
"-DSELECT_TYPE_RETV=int",
169-
"-DSEND_QUAL_ARG2=const",
170-
"-DSEND_TYPE_ARG1=int",
171-
"-DSEND_TYPE_ARG2=void*",
172-
"-DSEND_TYPE_ARG3=size_t",
173-
"-DSEND_TYPE_ARG4=int",
174-
"-DSEND_TYPE_RETV=ssize_t",
175-
"-DSIZEOF_CURL_OFF_T=8",
176-
"-DSIZEOF_INT=4",
177-
"-DSIZEOF_LONG=8",
178-
"-DSIZEOF_OFF_T=8",
179-
"-DSIZEOF_SHORT=2",
180-
"-DSIZEOF_SIZE_T=8",
181-
"-DSIZEOF_TIME_T=8",
182-
"-DSTDC_HEADERS=1",
183-
"-DSTRERROR_R_TYPE_ARG3=size_t",
184-
"-DTIME_WITH_SYS_TIME=1",
185-
"-DUSE_THREADS_POSIX=1",
186-
"-DUSE_UNIX_SOCKETS=1",
187-
188-
# Extra defines needed by curl
189-
"-DBUILDING_LIBCURL",
190-
"-DCURL_HIDDEN_SYMBOLS",
191-
],
194+
"//:osx": BASE_CURL_COPTS,
195+
"//conditions:default": BASE_CURL_COPTS + LINUX_CURL_COPTS,
192196
})

0 commit comments

Comments
 (0)