yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Require unix-utils in path for windows make"

Browse source 
This reverts commit 5d46cca09a.

In preparation of merging an external contribution that superseedes this

Conflicts:
	ChangeLog
This commit is contained in:
Manuel Pégourié-Gonnard 2015-02-16 15:25:31 +00:00
parent f812054d00
commit 09eb14c01e
5 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -24,9 +24,6 @@ Changes
"minimize" others (eg use stddef.h if only size_t is needed). "minimize" others (eg use stddef.h if only size_t is needed).
* Change #include lines in test files to use double quotes instead of angle * Change #include lines in test files to use double quotes instead of angle
brackets for uniformity with the rest of the code. brackets for uniformity with the rest of the code.
* Building with 'make' on windows now requires Unix utilities in the PATH
as well as a Unix shell. This enables more features such as the 'check'
target.
* Remove dependency on sscanf() in X.509 parsing modules. * Remove dependency on sscanf() in X.509 parsing modules.
= mbed TLS 1.3.10 released 2015-02-09 = mbed TLS 1.3.10 released 2015-02-09

6
README.rst
View file

@ -35,12 +35,6 @@ In order to run the tests, enter::
make check make check
If you're building on windows using mingw, msys, or some similar environment, you should define the WINDOWS variable (and possibly the CC variable too), eg::
make CC=gcc WINDOWS=1
You need to make sure the usual Unix utilities such as `ln` and `rm` are in your PATH and that make has access to a Unix shell.
Depending on your platform, you might run into some issues. Please check the Makefiles in *library/*, *programs/* and *tests/* for options to manually add or remove for specific platforms. You can also check `the mbed TLS Knowledge Base <https://polarssl.org/kb>`_ for articles on your platform or issue. Depending on your platform, you might run into some issues. Please check the Makefiles in *library/*, *programs/* and *tests/* for options to manually add or remove for specific platforms. You can also check `the mbed TLS Knowledge Base <https://polarssl.org/kb>`_ for articles on your platform or issue.
In case you find that you need to do something else as well, please let us know what, so we can add it to the KB. In case you find that you need to do something else as well, please let us know what, so we can add it to the KB.

13
library/Makefile
View file

@ -80,7 +80,11 @@ shared: libpolarssl.so
libpolarssl.a: libmbedtls.a libpolarssl.a: libmbedtls.a
echo " LN $@ -> $?" echo " LN $@ -> $?"
ifndef WINDOWS
ln -sf $? $@ ln -sf $? $@
else
copy /y /b $? $@
endif
libmbedtls.a: $(OBJS) libmbedtls.a: $(OBJS)
echo " AR $@" echo " AR $@"
@ -90,7 +94,11 @@ libmbedtls.a: $(OBJS)
libpolarssl.so: libmbedtls.so libpolarssl.so: libmbedtls.so
echo " LN $@ -> $?" echo " LN $@ -> $?"
ifndef WINDOWS
ln -sf $? $@ ln -sf $? $@
else
copy /y /b $? $@
endif
libmbedtls.${DLEXT}: $(OBJS) libmbedtls.${DLEXT}: $(OBJS)
echo " LD $@" echo " LD $@"
@ -113,4 +121,9 @@ libmbedtls.dll: $(OBJS)
$(CC) $(CFLAGS) $(OFLAGS) -c $< $(CC) $(CFLAGS) $(OFLAGS) -c $<
clean: clean:
ifndef WINDOWS
rm -f *.o libpolarssl.* libmbedtls.* rm -f *.o libpolarssl.* libmbedtls.*
endif
ifdef WINDOWS
del /Q /F *.o libpolarssl.* libmbedtls.*
endif

5
programs/Makefile
View file

@ -242,7 +242,12 @@ x509/cert_req: x509/cert_req.c ../library/libmbedtls.a
$(CC) $(CFLAGS) $(OFLAGS) x509/cert_req.c $(LDFLAGS) -o $@ $(CC) $(CFLAGS) $(OFLAGS) x509/cert_req.c $(LDFLAGS) -o $@
clean: clean:
ifndef WINDOWS
rm -f $(APPS) rm -f $(APPS)
endif
ifdef WINDOWS
del /S /Q /F *.o *.exe
endif
list: list:
echo $(APPS) echo $(APPS)

7
tests/Makefile
View file

@ -402,9 +402,15 @@ test_suite_version: test_suite_version.c $(DEP)
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
clean: clean:
ifndef WINDOWS
rm -f $(APPS) *.c rm -f $(APPS) *.c
endif
ifdef WINDOWS
del /Q /F *.c *.exe
endif
check: $(APPS) check: $(APPS)
ifndef WINDOWS
echo "Running checks (Success if all tests PASSED)" echo "Running checks (Success if all tests PASSED)"
RETURN=0; \ RETURN=0; \
for i in $(APPS); \ for i in $(APPS); \
@ -421,3 +427,4 @@ check: $(APPS)
echo ""; \ echo ""; \
done; \ done; \
if [ "$$RETURN" -eq 1 ]; then exit 1; fi if [ "$$RETURN" -eq 1 ]; then exit 1; fi
endif