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
|
Author: Aaron M. Ucko <amu@ucko.debian.net>
Date: Wed, 01 Dec 2021 23:33:11 -0500
Subject: Omit convenience mbed TLS copy
--- a/c++/src/connect/Makefile.connssl.lib
+++ b/c++/src/connect/Makefile.connssl.lib
@@ -1,6 +1,6 @@
# $Id: Makefile.connssl.lib 682178 2024-04-23 19:31:32Z ucko $
-CPPFLAGS = $(TLS_INCLUDE) -I$(srcdir)/mbedtls $(ORIG_CPPFLAGS)
+CPPFLAGS = $(TLS_INCLUDE) $(ORIG_CPPFLAGS)
SRC_MBED = aes aesce aesni aria asn1parse asn1write base64 bignum bignum_core \
bignum_mod bignum_mod_raw block_cipher camellia ccm chacha20 \
@@ -21,7 +21,7 @@ SRC_MBED = aes aesce aesni aria asn1pars
ssl_tls13_client ssl_tls13_generic ssl_tls13_keys ssl_tls13_server \
threading timing version_features x509 x509_create x509_crl \
x509_crt x509_csr x509write x509write_crt x509write_csr
-SRC_TLS = ncbi_gnutls ncbi_mbedtls ncbi_tls $(SRC_MBED:%=mbedtls/%)
+SRC_TLS = ncbi_gnutls ncbi_mbedtls ncbi_tls # $(SRC_MBED:%=mbedtls/%)
SRC = $(SRC_TLS)
LIB = connssl
--- a/c++/src/connect/Makefile.xxconnect2.lib
+++ b/c++/src/connect/Makefile.xxconnect2.lib
@@ -9,8 +9,7 @@ REQUIRES = LIBUV NGHTTP2
LIB_OR_DLL = both
DLL_LIB = xconnect
-CPPFLAGS = $(LIBUV_INCLUDE) $(NGHTTP2_INCLUDE) $(TLS_INCLUDE) \
- -I$(srcdir)/mbedtls $(ORIG_CPPFLAGS)
+CPPFLAGS = $(LIBUV_INCLUDE) $(NGHTTP2_INCLUDE) $(TLS_INCLUDE) $(ORIG_CPPFLAGS)
LIBS = $(XXCONNECT2_LIBS) $(ORIG_LIBS)
|
