yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-23 00:35:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream-public/pr/1499' into development-proposed

Browse Source
This commit is contained in:
Gilles Peskine 2018-04-01 12:41:22 +02:00
commit 0ed632f445
5 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -58,6 +58,11 @@ Changes
Krylov. Krylov.
* Improve the documentation of mbedtls_ssl_write(). Suggested by * Improve the documentation of mbedtls_ssl_write(). Suggested by
Paul Sokolovsky in #1356. Paul Sokolovsky in #1356.
* Add an option in the makefile to support ar utilities where the operation
letter must not be prefixed by '-', such as LLVM. Found and fixed by
Alex Hixon.
* Allow configuring the shared library extension by setting the DLEXT
environment variable when using the project makefiles.
= mbed TLS 2.8.0 branch released 2018-03-16 = mbed TLS 2.8.0 branch released 2018-03-16

21
library/Makefile
View File

@ -35,9 +35,12 @@ SOEXT_TLS=so.10
SOEXT_X509=so.0 SOEXT_X509=so.0
SOEXT_CRYPTO=so.1 SOEXT_CRYPTO=so.1
DLEXT=so # Set DLEXT=dylib to compile as a shared library for Mac OS X
# OSX shared library extension: DLEXT ?= so
# DLEXT=dylib
# Set AR_DASH= (empty string) to use an ar implentation that does not accept
# the - prefix for command line options (e.g. llvm-ar)
AR_DASH ?= -
# Windows shared library extension: # Windows shared library extension:
ifdef WINDOWS_BUILD ifdef WINDOWS_BUILD
@ -91,9 +94,9 @@ shared: libmbedcrypto.$(DLEXT) libmbedx509.$(DLEXT) libmbedtls.$(DLEXT)
# tls # tls
libmbedtls.a: $(OBJS_TLS) libmbedtls.a: $(OBJS_TLS)
echo " AR $@" echo " AR $@"
$(AR) -rc $@ $(OBJS_TLS) $(AR) $(AR_DASH)rc $@ $(OBJS_TLS)
echo " RL $@" echo " RL $@"
$(AR) -s $@ $(AR) $(AR_DASH)s $@
libmbedtls.$(SOEXT_TLS): $(OBJS_TLS) libmbedx509.so libmbedtls.$(SOEXT_TLS): $(OBJS_TLS) libmbedx509.so
echo " LD $@" echo " LD $@"
@ -114,9 +117,9 @@ libmbedtls.dll: $(OBJS_TLS) libmbedx509.dll
# x509 # x509
libmbedx509.a: $(OBJS_X509) libmbedx509.a: $(OBJS_X509)
echo " AR $@" echo " AR $@"
$(AR) -rc $@ $(OBJS_X509) $(AR) $(AR_DASH)rc $@ $(OBJS_X509)
echo " RL $@" echo " RL $@"
$(AR) -s $@ $(AR) $(AR_DASH)s $@
libmbedx509.$(SOEXT_X509): $(OBJS_X509) libmbedcrypto.so libmbedx509.$(SOEXT_X509): $(OBJS_X509) libmbedcrypto.so
echo " LD $@" echo " LD $@"
@ -137,9 +140,9 @@ libmbedx509.dll: $(OBJS_X509) libmbedcrypto.dll
# crypto # crypto
libmbedcrypto.a: $(OBJS_CRYPTO) libmbedcrypto.a: $(OBJS_CRYPTO)
echo " AR $@" echo " AR $@"
$(AR) -rc $@ $(OBJS_CRYPTO) $(AR) $(AR_DASH)rc $@ $(OBJS_CRYPTO)
echo " RL $@" echo " RL $@"
$(AR) -s $@ $(AR) $(AR_DASH)s $@
libmbedcrypto.$(SOEXT_CRYPTO): $(OBJS_CRYPTO) libmbedcrypto.$(SOEXT_CRYPTO): $(OBJS_CRYPTO)
echo " LD $@" echo " LD $@"

2
programs/Makefile
View File

@ -35,7 +35,7 @@ ifdef SHARED
SHARED_SUFFIX=.$(DLEXT) SHARED_SUFFIX=.$(DLEXT)
endif endif
else else
DLEXT=so DLEXT ?= so
EXEXT= EXEXT=
SHARED_SUFFIX= SHARED_SUFFIX=
endif endif

2
tests/Makefile
View File

@ -35,7 +35,7 @@ ifdef SHARED
SHARED_SUFFIX=.$(DLEXT) SHARED_SUFFIX=.$(DLEXT)
endif endif
else else
DLEXT=so DLEXT ?= so
EXEXT= EXEXT=
SHARED_SUFFIX= SHARED_SUFFIX=
endif endif

1
tests/scripts/run-test-suites.pl
View File

@ -41,6 +41,7 @@ die "$0: no test suite found\n" unless @suites;
# in case test suites are linked dynamically # in case test suites are linked dynamically
$ENV{'LD_LIBRARY_PATH'} = '../library'; $ENV{'LD_LIBRARY_PATH'} = '../library';
$ENV{'DYLD_LIBRARY_PATH'} = '../library';
my $prefix = $^O eq "MSWin32" ? '' : './'; my $prefix = $^O eq "MSWin32" ? '' : './';