diff options
| -rw-r--r-- | .gitmodules | 5 | ||||
| -rwxr-xr-x | build.sh | 6 | ||||
| m--------- | lib/libzip | 0 | ||||
| m--------- | lib/lua | 0 | ||||
| m--------- | lib/mbedtls | 0 |
5 files changed, 8 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index 231e6fc..c171b3a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,8 @@ path = lib/microtar url = https://github.com/rxi/microtar.git shallow = true +[submodule "lib/mbedtls"] + path = lib/mbedtls + url = https://github.com/Mbed-TLS/mbedtls.git + tag = mbedtls-2.28.3 + shallow = true @@ -7,10 +7,10 @@ : ${JOBS=4} SRCS="src/*.c" -CFLAGS="$CFLAGS -DMBEDTLS_DEBUG_C -Ilib/prefix/include" +CFLAGS="$CFLAGS -Ilib/prefix/include" LDFLAGS="$LDFLAGS -lm -Llib/prefix/lib" -[[ "$@" == "clean" ]] && rm -rf lib/libgit2/build lib/zlib/build lib/libzip/build lib/mbedtls-2.27.0/build lib/prefix lua $BIN *.exe src/lpm.luac src/lpm.lua.c && exit 0 +[[ "$@" == "clean" ]] && rm -rf lib/libgit2/build lib/zlib/build lib/libzip/build lib/mbedtls/build lib/prefix lua $BIN *.exe src/lpm.luac src/lpm.lua.c && exit 0 cmake --version >/dev/null 2>/dev/null || { echo "Please ensure that you have cmake installed." && exit -1; } # Build supporting libraries, libz, libmbedtls, libmbedcrypto, libgit2, libzip, libmicrotar, liblua @@ -22,7 +22,7 @@ if [[ "$@" != *"-lz"* ]]; then LDFLAGS="$LDFLAGS -lz" fi if [[ "$@" != *"-lmbedtls"* && "$@" != *"-lmbedcrypto"* && "$@" != *"-lmbedx509"* ]]; then - [ ! -e "lib/mbedtls-2.27.0/build" ] && { cd lib/mbedtls-2.27.0 && mkdir build && cd build && CFLAGS="$CFLAGS $CFLAGS_MBEDTLS -DMBEDTLS_MD4_C=1 -w" cmake .. $CMAKE_DEFAULT_FLAGS -G "Unix Makefiles" -DENABLE_TESTING=OFF -DENABLE_PROGRAMS=OFF $SSL_CONFIGURE && CFLAGS="$CFLAGS $CFLAGS_MBEDTLS -DMBEDTLS_MD4_C=1 -w" $MAKE -j $JOBS && $MAKE install && cd ../../../ || exit -1; } + [ ! -e "lib/mbedtls/build" ] && { cd lib/mbedtls && mkdir build && cd build && CFLAGS="$CFLAGS $CFLAGS_MBEDTLS -DMBEDTLS_MD4_C=1 -DMBEDTLS_DEBUG_C -w" cmake .. $CMAKE_DEFAULT_FLAGS -G "Unix Makefiles" -DENABLE_TESTING=OFF -DENABLE_PROGRAMS=OFF $SSL_CONFIGURE && CFLAGS="$CFLAGS $CFLAGS_MBEDTLS -DMBEDTLS_MD4_C=1 -w" $MAKE -j $JOBS && $MAKE install && cd ../../../ || exit -1; } LDFLAGS="$LDFLAGS -lmbedtls -lmbedx509 -lmbedcrypto" fi if [[ "$@" != *"-lgit2"* ]]; then diff --git a/lib/libzip b/lib/libzip -Subproject 46cafac76bc1f1628b91ac205bf8fa36718bdd1 +Subproject 5ea6a22f41b4ebbc78bbb459a54bb4ee4f8f945 diff --git a/lib/lua b/lib/lua -Subproject be908a7d4d8130264ad67c5789169769f824c5d +Subproject ea39042e13645f63713425c05cc9ee4cfdcf0a4 diff --git a/lib/mbedtls b/lib/mbedtls new file mode 160000 +Subproject 981743de6fcdbe672e482b6fd724d31d0a0d247 |