mirror of
https://github.com/jedisct1/libsodium.git
synced 2024-12-23 20:15:19 -07:00
Change so all builds will allow full builds.
This commit is contained in:
parent
a0cbef0a4a
commit
2f4d911300
@ -45,12 +45,13 @@ env - PATH="$PATH" \
|
||||
"$MAKE_TOOLCHAIN" --force --api="$NDK_API_VERSION_COMPAT" \
|
||||
--arch="$ARCH" --install-dir="$TOOLCHAIN_DIR" || exit 1
|
||||
|
||||
if [ -z "$LIBSODIUM_ANDROID_CONFIGURE_FLAGS" ]; then
|
||||
export LIBSODIUM_ANDROID_CONFIGURE_FLAGS="--disable-soname-versions --enable-minimal"
|
||||
if [ -z "$LIBSODIUM_ENABLE_MINIMAL_FLAG" ]; then
|
||||
export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
|
||||
fi
|
||||
|
||||
./configure \
|
||||
${LIBSODIUM_ANDROID_CONFIGURE_FLAGS} \
|
||||
--disable-soname-versions \
|
||||
${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
|
||||
--host="${HOST_COMPILER}" \
|
||||
--prefix="${PREFIX}" \
|
||||
--with-sysroot="${TOOLCHAIN_DIR}/sysroot" || exit 1
|
||||
@ -65,7 +66,8 @@ if [ "$NDK_PLATFORM" != "$NDK_PLATFORM_COMPAT" ]; then
|
||||
--arch="$ARCH" --install-dir="$TOOLCHAIN_DIR" || exit 1
|
||||
|
||||
./configure \
|
||||
${LIBSODIUM_ANDROID_CONFIGURE_FLAGS} \
|
||||
--disable-soname-versions \
|
||||
${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
|
||||
--host="${HOST_COMPILER}" \
|
||||
--prefix="${PREFIX}" \
|
||||
--with-sysroot="${TOOLCHAIN_DIR}/sysroot" || exit 1
|
||||
|
@ -33,9 +33,13 @@ export LDFLAGS="-arch i386 -isysroot ${SDK} -mios-simulator-version-min=${IOS_SI
|
||||
|
||||
make distclean > /dev/null
|
||||
|
||||
if [ -z "$LIBSODIUM_ENABLE_MINIMAL_FLAG" ]; then
|
||||
export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
|
||||
fi
|
||||
|
||||
./configure --host=i686-apple-darwin10 \
|
||||
--disable-shared \
|
||||
--enable-minimal \
|
||||
${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
|
||||
--prefix="$SIMULATOR32_PREFIX" || exit 1
|
||||
|
||||
make -j3 install || exit 1
|
||||
@ -48,7 +52,7 @@ make distclean > /dev/null
|
||||
|
||||
./configure --host=x86_64-apple-darwin10 \
|
||||
--disable-shared \
|
||||
--enable-minimal \
|
||||
${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
|
||||
--prefix="$SIMULATOR64_PREFIX"
|
||||
|
||||
make -j3 install || exit 1
|
||||
@ -66,7 +70,7 @@ make distclean > /dev/null
|
||||
|
||||
./configure --host=arm-apple-darwin10 \
|
||||
--disable-shared \
|
||||
--enable-minimal \
|
||||
${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
|
||||
--prefix="$IOS32_PREFIX" || exit 1
|
||||
|
||||
make -j3 install || exit 1
|
||||
@ -79,7 +83,7 @@ make distclean > /dev/null
|
||||
|
||||
./configure --host=arm-apple-darwin10 \
|
||||
--disable-shared \
|
||||
--enable-minimal \
|
||||
${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
|
||||
--prefix="$IOS32s_PREFIX" || exit 1
|
||||
|
||||
make -j3 install || exit 1
|
||||
@ -92,7 +96,7 @@ make distclean > /dev/null
|
||||
|
||||
./configure --host=arm-apple-darwin10 \
|
||||
--disable-shared \
|
||||
--enable-minimal \
|
||||
${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
|
||||
--prefix="$IOS64_PREFIX" || exit 1
|
||||
|
||||
make -j3 install || exit 1
|
||||
|
@ -19,7 +19,11 @@ mkdir -p $PREFIX || exit 1
|
||||
|
||||
make distclean > /dev/null
|
||||
|
||||
./configure --enable-minimal \
|
||||
if [ -z "$LIBSODIUM_ENABLE_MINIMAL_FLAG" ]; then
|
||||
export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
|
||||
fi
|
||||
|
||||
./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
|
||||
--host=nacl \
|
||||
--disable-ssp --without-pthreads \
|
||||
--prefix="$PREFIX" || exit 1
|
||||
|
@ -11,7 +11,11 @@ mkdir -p $PREFIX || exit 1
|
||||
|
||||
make distclean > /dev/null
|
||||
|
||||
./configure --enable-minimal \
|
||||
if [ -z "$LIBSODIUM_ENABLE_MINIMAL_FLAG" ]; then
|
||||
export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
|
||||
fi
|
||||
|
||||
./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
|
||||
--host=i686-nacl \
|
||||
--disable-ssp --without-pthreads \
|
||||
--prefix="$PREFIX" || exit 1
|
||||
|
@ -11,7 +11,11 @@ mkdir -p $PREFIX || exit 1
|
||||
|
||||
make distclean > /dev/null
|
||||
|
||||
./configure --enable-minimal \
|
||||
if [ -z "$LIBSODIUM_ENABLE_MINIMAL_FLAG" ]; then
|
||||
export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
|
||||
fi
|
||||
|
||||
./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
|
||||
--host=x86_64-nacl \
|
||||
--disable-ssp --without-pthreads \
|
||||
--prefix="$PREFIX" || exit 1
|
||||
|
@ -11,7 +11,11 @@ export LDFLAGS="-arch x86_64 -mmacosx-version-min=${OSX_VERSION_MIN} -march=${OS
|
||||
|
||||
make distclean > /dev/null
|
||||
|
||||
./configure --enable-minimal \
|
||||
if [ -z "$LIBSODIUM_ENABLE_MINIMAL_FLAG" ]; then
|
||||
export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
|
||||
fi
|
||||
|
||||
./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
|
||||
--prefix="$PREFIX" || exit 1
|
||||
|
||||
make -j3 check && make -j3 install || exit 1
|
||||
|
Loading…
Reference in New Issue
Block a user