Suyu/mbedtls
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/mbedtls.git synced 2025-12-24 00:06:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Jaeden Amero 2018-03-28 15:35:22 +01:00
commit 90226be779
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -26,6 +26,8 @@ Bugfix
* Add missing dependencies for MBEDTLS_HAVE_TIME_DATE and * Add missing dependencies for MBEDTLS_HAVE_TIME_DATE and
MBEDTLS_VERSION_FEATURES in test suites. Contributed by Deomid Ryabkov. MBEDTLS_VERSION_FEATURES in test suites. Contributed by Deomid Ryabkov.
Fixes #1299, #1475. Fixes #1299, #1475.
* Fix dynamic library building process with Makefile on Mac OS X. Fixed by
mnacamura.
Changes Changes
* Remove some redundant code in bignum.c. Contributed by Alexey Skalozub. * Remove some redundant code in bignum.c. Contributed by Alexey Skalozub.

8
library/Makefile
View file

@ -103,9 +103,9 @@ libmbedtls.so: libmbedtls.$(SOEXT_TLS)
echo " LN $@ -> $<" echo " LN $@ -> $<"
ln -sf $< $@ ln -sf $< $@
libmbedtls.dylib: $(OBJS_TLS) libmbedtls.dylib: $(OBJS_TLS) libmbedx509.dylib
echo " LD $@" echo " LD $@"
$(CC) -dynamiclib $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_TLS) $(CC) -dynamiclib -L. -lmbedcrypto -lmbedx509 $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_TLS)
libmbedtls.dll: $(OBJS_TLS) libmbedx509.dll libmbedtls.dll: $(OBJS_TLS) libmbedx509.dll
echo " LD $@" echo " LD $@"
@ -126,9 +126,9 @@ libmbedx509.so: libmbedx509.$(SOEXT_X509)
echo " LN $@ -> $<" echo " LN $@ -> $<"
ln -sf $< $@ ln -sf $< $@
libmbedx509.dylib: $(OBJS_X509) libmbedx509.dylib: $(OBJS_X509) libmbedcrypto.dylib
echo " LD $@" echo " LD $@"
$(CC) -dynamiclib $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_X509) $(CC) -dynamiclib -L. -lmbedcrypto $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_X509)
libmbedx509.dll: $(OBJS_X509) libmbedcrypto.dll libmbedx509.dll: $(OBJS_X509) libmbedcrypto.dll
echo " LD $@" echo " LD $@"