1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
|
https://github.com/curl/curl/commit/647e86a3efe1eea7a2a456c009cfe1eb55fe48eb
https://github.com/curl/curl/pull/13202
From: Matt Jolly <Matt.Jolly@footclan.ninja>
Date: Fri, 29 Mar 2024 09:58:14 +1000
Subject: [PATCH] curl-rustls.m4: add pkg-config support to rustls detection
Based on the existing openssl pkg-config detection, this commit tries to
use pkg-config to find `rustls` then falls back to the current approach
if that fails.
We use the following logic:
- if no path is provided, just use pkg-config, if it's not there we have
a problem!
- if a path is provided, try pkg-config
+ if pkg-config fails, try and find rustls directly
---
m4/curl-rustls.m4 | 209 ++++++++++++++++++++++++++++++++--------------
1 file changed, 145 insertions(+), 64 deletions(-)
diff --git a/m4/curl-rustls.m4 b/m4/curl-rustls.m4
index 75542e4..902327a 100644
--- a/m4/curl-rustls.m4
+++ b/m4/curl-rustls.m4
@@ -28,84 +28,165 @@ dnl check for rustls
dnl ----------------------------------------------------
if test "x$OPT_RUSTLS" != xno; then
- _cppflags=$CPPFLAGS
- _ldflags=$LDFLAGS
ssl_msg=
- if test X"$OPT_RUSTLS" != Xno; then
+ dnl backup the pre-ssl variables
+ CLEANLDFLAGS="$LDFLAGS"
+ CLEANCPPFLAGS="$CPPFLAGS"
- if test "$OPT_RUSTLS" = "yes"; then
- OPT_RUSTLS=""
- fi
+ case $host_os in
+ darwin*)
+ LDFLAGS="$LDFLAGS -framework Security"
+ ;;
+ *)
+ ;;
+ esac
+ ## NEW CODE
- case $host_os in
- darwin*)
- LDFLAGS="$LDFLAGS -framework Security"
- ;;
- *)
- ;;
- esac
-
- if test -z "$OPT_RUSTLS" ; then
- dnl check for lib first without setting any new path
-
- AC_CHECK_LIB(rustls, rustls_client_session_read,
- dnl librustls found, set the variable
- [
- AC_DEFINE(USE_RUSTLS, 1, [if rustls is enabled])
- AC_SUBST(USE_RUSTLS, [1])
- RUSTLS_ENABLED=1
- USE_RUSTLS="yes"
- ssl_msg="rustls"
- test rustls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
- ], [], -lpthread -ldl -lm)
- fi
+ dnl use pkg-config unless we have been given a path
+ dnl even then, try pkg-config first
- if test "x$USE_RUSTLS" != "xyes"; then
- dnl add the path and test again
- addld=-L$OPT_RUSTLS/lib$libsuff
- addcflags=-I$OPT_RUSTLS/include
- rustlslib=$OPT_RUSTLS/lib$libsuff
+ case "$OPT_RUSTLS" in
+ yes)
+ dnl --with-rustls (without path) used
+ PKGTEST="yes"
+ PREFIX_RUSTLS=
+ ;;
+ *)
+ dnl check the provided --with-rustls path
+ PKGTEST="no"
+ PREFIX_RUSTLS=$OPT_RUSTLS
- LDFLAGS="$LDFLAGS $addld"
- if test "$addcflags" != "-I/usr/include"; then
- CPPFLAGS="$CPPFLAGS $addcflags"
+ dnl Try pkg-config even when cross-compiling. Since we
+ dnl specify PKG_CONFIG_LIBDIR we are only looking where
+ dnl the user told us to look
+
+ RUSTLS_PCDIR="$PREFIX_RUSTLS/lib/pkgconfig"
+ if test -f "$RUSTLS_PCDIR/rustls.pc"; then
+ AC_MSG_NOTICE([PKG_CONFIG_LIBDIR will be set to "$RUSTLS_PCDIR"])
+ PKGTEST="yes"
fi
- AC_CHECK_LIB(rustls, rustls_connection_read,
- [
- AC_DEFINE(USE_RUSTLS, 1, [if rustls is enabled])
- AC_SUBST(USE_RUSTLS, [1])
- RUSTLS_ENABLED=1
- USE_RUSTLS="yes"
- ssl_msg="rustls"
- test rustls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
- ],
- AC_MSG_ERROR([--with-rustls was specified but could not find rustls.]),
- -lpthread -ldl -lm)
- fi
+ if test "$PKGTEST" != "yes"; then
+ # try lib64 instead
+ RUSTLS_PCDIR="$PREFIX_RUSTLS/lib64/pkgconfig"
+ if test -f "$RUSTLS_PCDIR/rustls.pc"; then
+ AC_MSG_NOTICE([PKG_CONFIG_LIBDIR will be set to "$RUSTLS_PCDIR"])
+ PKGTEST="yes"
+ fi
+ fi
+
+ if test "$PKGTEST" != "yes"; then
+ dnl pkg-config came up empty, use what we got
+ dnl via --with-rustls
- if test "x$USE_RUSTLS" = "xyes"; then
- AC_MSG_NOTICE([detected rustls])
- check_for_ca_bundle=1
-
- LIBS="-lrustls -lpthread -ldl -lm $LIBS"
-
- if test -n "$rustlslib"; then
- dnl when shared libs were found in a path that the run-time
- dnl linker doesn't search through, we need to add it to
- dnl CURL_LIBRARY_PATH to prevent further configure tests to fail
- dnl due to this
- if test "x$cross_compiling" != "xyes"; then
- CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$rustlslib"
- export CURL_LIBRARY_PATH
- AC_MSG_NOTICE([Added $rustlslib to CURL_LIBRARY_PATH])
+ addld=-L$PREFIX_RUSTLS/lib$libsuff
+ addcflags=-I$PREFIX_RUSTLS/include
+
+ LDFLAGS="$LDFLAGS $addld"
+ if test "$addcflags" != "-I/usr/include"; then
+ CPPFLAGS="$CPPFLAGS $addcflags"
+ fi
+
+ AC_CHECK_LIB(rustls, rustls_connection_read,
+ [
+ AC_DEFINE(USE_RUSTLS, 1, [if rustls is enabled])
+ AC_SUBST(USE_RUSTLS, [1])
+ RUSTLS_ENABLED=1
+ USE_RUSTLS="yes"
+ ssl_msg="rustls"
+ test rustls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
+ ],
+ AC_MSG_ERROR([--with-rustls was specified but could not find rustls.]),
+ -lpthread -ldl -lm)
+
+ USE_RUSTLS="yes"
+ ssl_msg="rustls"
+
+ LIB_RUSTLS="$PREFIX_RUSTLS/lib$libsuff"
+ if test "$PREFIX_RUSTLS" != "/usr" ; then
+ SSL_LDFLAGS="-L$LIB_RUSTLS"
+ SSL_CPPFLAGS="-I$PREFIX_RUSTLS/include"
fi
fi
+ ;;
+ esac
+
+ if test "$PKGTEST" = "yes"; then
+
+ CURL_CHECK_PKGCONFIG(rustls, [$RUSTLS_PCDIR])
+
+ if test "$PKGCONFIG" != "no" ; then
+ SSL_LIBS=`CURL_EXPORT_PCDIR([$RUSTLS_PCDIR]) dnl
+ $PKGCONFIG --libs-only-l --libs-only-other rustls 2>/dev/null`
+
+ SSL_LDFLAGS=`CURL_EXPORT_PCDIR([$RUSTLS_PCDIR]) dnl
+ $PKGCONFIG --libs-only-L rustls 2>/dev/null`
+
+ SSL_CPPFLAGS=`CURL_EXPORT_PCDIR([$RUSTLS_PCDIR]) dnl
+ $PKGCONFIG --cflags-only-I rustls 2>/dev/null`
+
+ AC_SUBST(SSL_LIBS)
+ AC_MSG_NOTICE([pkg-config: SSL_LIBS: "$SSL_LIBS"])
+ AC_MSG_NOTICE([pkg-config: SSL_LDFLAGS: "$SSL_LDFLAGS"])
+ AC_MSG_NOTICE([pkg-config: SSL_CPPFLAGS: "$SSL_CPPFLAGS"])
+
+ LIB_RUSTLS=`echo $SSL_LDFLAGS | sed -e 's/^-L//'`
+
+ dnl use the values pkg-config reported. This is here
+ dnl instead of below with CPPFLAGS and LDFLAGS because we only
+ dnl learn about this via pkg-config. If we only have
+ dnl the argument to --with-rustls we don't know what
+ dnl additional libs may be necessary. Hope that we
+ dnl don't need any.
+ LIBS="$SSL_LIBS $LIBS"
+ USE_RUSTLS="yes"
+ ssl_msg="rustls"
+ AC_DEFINE(USE_RUSTLS, 1, [if rustls is enabled])
+ AC_SUBST(USE_RUSTLS, [1])
+ RUSTLS_ENABLED=1
+ test rustls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
+ else
+ AC_MSG_ERROR([pkg-config: Could not find rustls])
fi
- fi dnl rustls not disabled
+ else
+ dnl we did not use pkg-config, so we need to add the
+ dnl rustls lib to LIBS
+ LIBS="-lrustls -lpthread -ldl -lm $LIBS"
+ fi
+
+ dnl finally, set flags to use this TLS backend
+ CPPFLAGS="$CLEAN_CPPFLAGS $SSL_CPPFLAGS"
+ LDFLAGS="$CLAN_LDFLAGS $SSL_LDFLAGS"
+
+ if test "x$USE_RUSTLS" = "xyes"; then
+ AC_MSG_NOTICE([detected rustls])
+ check_for_ca_bundle=1
+
+ if test -n "$LIB_RUSTLS"; then
+ dnl when shared libs were found in a path that the run-time
+ dnl linker does not search through, we need to add it to
+ dnl CURL_LIBRARY_PATH so that further configure tests do not
+ dnl fail due to this
+ if test "x$cross_compiling" != "xyes"; then
+ CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$LIB_RUSTLS"
+ export CURL_LIBRARY_PATH
+ AC_MSG_NOTICE([Added $LIB_RUSTLS to CURL_LIBRARY_PATH])
+ fi
+ fi
+ fi
test -z "$ssl_msg" || ssl_backends="${ssl_backends:+$ssl_backends, }$ssl_msg"
+
+ if test X"$OPT_RUSTLS" != Xno &&
+ test "$RUSTLS_ENABLED" != "1"; then
+ AC_MSG_NOTICE([OPT_RUSTLS: $OPT_RUSTLS])
+ AC_MSG_NOTICE([RUSTLS_ENABLED: $RUSTLS_ENABLED])
+ AC_MSG_ERROR([--with-rustls was given but Rustls could not be detected])
+ fi
fi
])
+
+
+RUSTLS_ENABLED
--
2.44.0
|
