kevin/libsodium
1
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-20 10:37:24 -07:00
Code Releases Wiki Activity

Merge pull request #692 from kalaspuffar/master

Browse Source 
Adding option to enable a full build
This commit is contained in:
Frank Denis 2018-03-06 22:06:25 +01:00 committed by GitHub
commit 13ed035d7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 48 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dist-build/android-build.sh
View File

@ -45,9 +45,15 @@ env - PATH="$PATH" \
"$MAKE_TOOLCHAIN" --force --api="$NDK_API_VERSION_COMPAT" \ "$MAKE_TOOLCHAIN" --force --api="$NDK_API_VERSION_COMPAT" \
--arch="$ARCH" --install-dir="$TOOLCHAIN_DIR" || exit 1 --arch="$ARCH" --install-dir="$TOOLCHAIN_DIR" || exit 1
if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
else
export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
fi
./configure \ ./configure \
--disable-soname-versions \ --disable-soname-versions \
--enable-minimal \ ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
--host="${HOST_COMPILER}" \ --host="${HOST_COMPILER}" \
--prefix="${PREFIX}" \ --prefix="${PREFIX}" \
--with-sysroot="${TOOLCHAIN_DIR}/sysroot" || exit 1 --with-sysroot="${TOOLCHAIN_DIR}/sysroot" || exit 1
@ -63,7 +69,7 @@ if [ "$NDK_PLATFORM" != "$NDK_PLATFORM_COMPAT" ]; then
./configure \ ./configure \
--disable-soname-versions \ --disable-soname-versions \
--enable-minimal \ ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
--host="${HOST_COMPILER}" \ --host="${HOST_COMPILER}" \
--prefix="${PREFIX}" \ --prefix="${PREFIX}" \
--with-sysroot="${TOOLCHAIN_DIR}/sysroot" || exit 1 --with-sysroot="${TOOLCHAIN_DIR}/sysroot" || exit 1

16
dist-build/ios.sh
View File

@ -33,9 +33,15 @@ export LDFLAGS="-arch i386 -isysroot ${SDK} -mios-simulator-version-min=${IOS_SI
make distclean > /dev/null make distclean > /dev/null
if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
else
export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
fi
./configure --host=i686-apple-darwin10 \ ./configure --host=i686-apple-darwin10 \
--disable-shared \ --disable-shared \
--enable-minimal \ ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
--prefix="$SIMULATOR32_PREFIX" || exit 1 --prefix="$SIMULATOR32_PREFIX" || exit 1
make -j3 install || exit 1 make -j3 install || exit 1
@ -48,7 +54,7 @@ make distclean > /dev/null
./configure --host=x86_64-apple-darwin10 \ ./configure --host=x86_64-apple-darwin10 \
--disable-shared \ --disable-shared \
--enable-minimal \ ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
--prefix="$SIMULATOR64_PREFIX" --prefix="$SIMULATOR64_PREFIX"
make -j3 install || exit 1 make -j3 install || exit 1
@ -66,7 +72,7 @@ make distclean > /dev/null
./configure --host=arm-apple-darwin10 \ ./configure --host=arm-apple-darwin10 \
--disable-shared \ --disable-shared \
--enable-minimal \ ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
--prefix="$IOS32_PREFIX" || exit 1 --prefix="$IOS32_PREFIX" || exit 1
make -j3 install || exit 1 make -j3 install || exit 1
@ -79,7 +85,7 @@ make distclean > /dev/null
./configure --host=arm-apple-darwin10 \ ./configure --host=arm-apple-darwin10 \
--disable-shared \ --disable-shared \
--enable-minimal \ ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
--prefix="$IOS32s_PREFIX" || exit 1 --prefix="$IOS32s_PREFIX" || exit 1
make -j3 install || exit 1 make -j3 install || exit 1
@ -92,7 +98,7 @@ make distclean > /dev/null
./configure --host=arm-apple-darwin10 \ ./configure --host=arm-apple-darwin10 \
--disable-shared \ --disable-shared \
--enable-minimal \ ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
--prefix="$IOS64_PREFIX" || exit 1 --prefix="$IOS64_PREFIX" || exit 1
make -j3 install || exit 1 make -j3 install || exit 1

8
dist-build/nativeclient-pnacl.sh
View File

@ -19,7 +19,13 @@ mkdir -p $PREFIX || exit 1
make distclean > /dev/null make distclean > /dev/null
./configure --enable-minimal \ if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
else
export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
fi
./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
--host=nacl \ --host=nacl \
--disable-ssp --without-pthreads \ --disable-ssp --without-pthreads \
--prefix="$PREFIX" || exit 1 --prefix="$PREFIX" || exit 1

9
dist-build/nativeclient-x86.sh
View File

@ -11,7 +11,14 @@ mkdir -p $PREFIX || exit 1
make distclean > /dev/null make distclean > /dev/null
./configure --enable-minimal \ if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
else
export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
fi
./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
--host=i686-nacl \ --host=i686-nacl \
--disable-ssp --without-pthreads \ --disable-ssp --without-pthreads \
--prefix="$PREFIX" || exit 1 --prefix="$PREFIX" || exit 1

8
dist-build/nativeclient-x86_64.sh
View File

@ -11,7 +11,13 @@ mkdir -p $PREFIX || exit 1
make distclean > /dev/null make distclean > /dev/null
./configure --enable-minimal \ if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
else
export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
fi
./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
--host=x86_64-nacl \ --host=x86_64-nacl \
--disable-ssp --without-pthreads \ --disable-ssp --without-pthreads \
--prefix="$PREFIX" || exit 1 --prefix="$PREFIX" || exit 1

8
dist-build/osx.sh
View File

@ -11,7 +11,13 @@ export LDFLAGS="-arch x86_64 -mmacosx-version-min=${OSX_VERSION_MIN} -march=${OS
make distclean > /dev/null make distclean > /dev/null
./configure --enable-minimal \ if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
else
export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
fi
./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
--prefix="$PREFIX" || exit 1 --prefix="$PREFIX" || exit 1
make -j3 check && make -j3 install || exit 1 make -j3 check && make -j3 install || exit 1