From 2f4d911300f6aec5cad2ab6a0b26df7123288f08 Mon Sep 17 00:00:00 2001 From: Daniel Persson Date: Tue, 6 Mar 2018 20:36:39 +0100 Subject: [PATCH] Change so all builds will allow full builds. --- dist-build/android-build.sh | 10 ++++++---- dist-build/ios.sh | 14 +++++++++----- dist-build/nativeclient-pnacl.sh | 6 +++++- dist-build/nativeclient-x86.sh | 6 +++++- dist-build/nativeclient-x86_64.sh | 6 +++++- dist-build/osx.sh | 6 +++++- 6 files changed, 35 insertions(+), 13 deletions(-) diff --git a/dist-build/android-build.sh b/dist-build/android-build.sh index bb903687..4453d434 100755 --- a/dist-build/android-build.sh +++ b/dist-build/android-build.sh @@ -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 diff --git a/dist-build/ios.sh b/dist-build/ios.sh index c6d2d629..9b81e3bc 100755 --- a/dist-build/ios.sh +++ b/dist-build/ios.sh @@ -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 diff --git a/dist-build/nativeclient-pnacl.sh b/dist-build/nativeclient-pnacl.sh index 17e8159e..80fbbbe9 100755 --- a/dist-build/nativeclient-pnacl.sh +++ b/dist-build/nativeclient-pnacl.sh @@ -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 diff --git a/dist-build/nativeclient-x86.sh b/dist-build/nativeclient-x86.sh index 2db1836d..637a2062 100755 --- a/dist-build/nativeclient-x86.sh +++ b/dist-build/nativeclient-x86.sh @@ -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 diff --git a/dist-build/nativeclient-x86_64.sh b/dist-build/nativeclient-x86_64.sh index 40fe6e54..dbe4956e 100755 --- a/dist-build/nativeclient-x86_64.sh +++ b/dist-build/nativeclient-x86_64.sh @@ -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 diff --git a/dist-build/osx.sh b/dist-build/osx.sh index 3e126d93..501d1d2d 100755 --- a/dist-build/osx.sh +++ b/dist-build/osx.sh @@ -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