Latest libsodium-1.0.18-stable.tar.gz.
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4193 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
144
deps/libsodium/dist-build/android-aar.sh
vendored
Executable file
144
deps/libsodium/dist-build/android-aar.sh
vendored
Executable file
@ -0,0 +1,144 @@
|
||||
#! /bin/sh
|
||||
|
||||
# Create an AAR with libsodium in all combinations of static | shared | minimal | full.
|
||||
#
|
||||
# The x86 static library will not work due to text relocation rules, so static x86 versions are limited to shared libraries.
|
||||
# To simplify linking, library variants have distinct names: sodium, sodium-static, sodium-minimal and sodium-minimal-static.
|
||||
|
||||
SODIUM_VERSION="1.0.18.0"
|
||||
NDK_VERSION=$(grep "Pkg.Revision = " <"${ANDROID_NDK_HOME}/source.properties" | cut -f 2 -d '=' | cut -f 2 -d' ' | cut -f 1 -d'.')
|
||||
DEST_PATH=$(mktemp -d)
|
||||
|
||||
cd "$(dirname "$0")/../" || exit
|
||||
|
||||
make_abi_json() {
|
||||
echo "{\"abi\":\"${NDK_ARCH}\",\"api\":${SDK_VERSION},\"ndk\":${NDK_VERSION},\"stl\":\"none\"}" >"$1/abi.json"
|
||||
}
|
||||
|
||||
make_prefab_json() {
|
||||
echo "{\"name\":\"sodium\",\"schema_version\":1,\"dependencies\":[],\"version\":\"$SODIUM_VERSION\"}" >"$1/prefab.json"
|
||||
}
|
||||
|
||||
make_manifest() {
|
||||
echo "<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\" package=\"com.android.ndk.thirdparty.sodium\" android:versionCode=\"1\" android:versionName=\"1.0\">
|
||||
<uses-sdk android:minSdkVersion=\"19\" android:targetSdkVersion=\"21\"/>
|
||||
</manifest>" >"${1}/AndroidManifest.xml"
|
||||
}
|
||||
|
||||
make_prefab_structure() {
|
||||
mkdir "$DEST_PATH"
|
||||
|
||||
for variant_dirs in "prefab" "prefab/modules" "META-INF"; do
|
||||
mkdir "${DEST_PATH}/${variant_dirs}"
|
||||
done
|
||||
|
||||
make_prefab_json "${DEST_PATH}/prefab"
|
||||
make_manifest "${DEST_PATH}"
|
||||
cp "LICENSE" "${DEST_PATH}/META-INF"
|
||||
|
||||
for variant in \
|
||||
"prefab/modules/sodium" "prefab/modules/sodium-static" \
|
||||
"prefab/modules/sodium-minimal" "prefab/modules/sodium-minimal-static"; do
|
||||
mkdir "${DEST_PATH}/${variant}"
|
||||
|
||||
if [ "$variant" = "prefab/modules/sodium-minimal" ]; then
|
||||
echo "{\"library_name\":\"libsodium\"}" >"${DEST_PATH}/${variant}/module.json"
|
||||
else
|
||||
echo "{}" >"${DEST_PATH}/${variant}/module.json"
|
||||
fi
|
||||
|
||||
mkdir "${DEST_PATH}/${variant}/libs"
|
||||
|
||||
for arch in "arm64-v8a" "armeabi-v7a" "x86" "x86_64"; do
|
||||
mkdir "$DEST_PATH/${variant}/libs/android.${arch}"
|
||||
mkdir "$DEST_PATH/${variant}/libs/android.${arch}/include"
|
||||
NDK_ARCH="$arch"
|
||||
if [ $arch = "arm64-v8a" ] || [ $arch = "x86_64" ]; then
|
||||
SDK_VERSION="21"
|
||||
else
|
||||
SDK_VERSION="19"
|
||||
fi
|
||||
|
||||
make_abi_json "$DEST_PATH/${variant}/libs/android.${arch}"
|
||||
done
|
||||
done
|
||||
}
|
||||
|
||||
copy_libs() {
|
||||
SRC_DIR="libsodium-android-${1}"
|
||||
|
||||
SHARED_DEST_DIR="${DEST_PATH}/prefab/modules/sodium${3}/libs/android.${2}"
|
||||
STATIC_DEST_DIR="${DEST_PATH}/prefab/modules/sodium${3}-static/libs/android.${2}"
|
||||
|
||||
cp -r "${SRC_DIR}/include" "$SHARED_DEST_DIR"
|
||||
cp -r "${SRC_DIR}/include" "$STATIC_DEST_DIR"
|
||||
cp "${SRC_DIR}/lib/libsodium.so" "${SHARED_DEST_DIR}/libsodium.so"
|
||||
cp "${SRC_DIR}/lib/libsodium.a" "${STATIC_DEST_DIR}/libsodium${3}-static.a"
|
||||
|
||||
rm -r "$SRC_DIR"
|
||||
}
|
||||
|
||||
build_all() {
|
||||
dist-build/android-armv7-a.sh
|
||||
dist-build/android-armv8-a.sh
|
||||
dist-build/android-x86_64.sh
|
||||
dist-build/android-x86.sh
|
||||
}
|
||||
|
||||
make_prefab_structure
|
||||
|
||||
build_all
|
||||
|
||||
copy_libs "armv7-a" "armeabi-v7a" "-minimal"
|
||||
copy_libs "armv8-a+crypto" "arm64-v8a" "-minimal"
|
||||
copy_libs "i686" "x86" "-minimal"
|
||||
copy_libs "westmere" "x86_64" "-minimal"
|
||||
|
||||
LIBSODIUM_FULL_BUILD="Y"
|
||||
export LIBSODIUM_FULL_BUILD
|
||||
|
||||
build_all
|
||||
|
||||
copy_libs "armv7-a" "armeabi-v7a"
|
||||
copy_libs "armv8-a+crypto" "arm64-v8a"
|
||||
copy_libs "i686" "x86"
|
||||
copy_libs "westmere" "x86_64"
|
||||
|
||||
AAR_PATH="$(pwd)/libsodium-${SODIUM_VERSION}.aar"
|
||||
cd "$DEST_PATH" || exit
|
||||
rm "$AAR_PATH"
|
||||
zip -9 -r "$AAR_PATH" META-INF prefab AndroidManifest.xml
|
||||
cd .. || exit
|
||||
rm -r "$DEST_PATH"
|
||||
|
||||
echo
|
||||
echo "Congrats you have built an AAR containing libsodium! To use it with
|
||||
gradle or cmake (as set by default for Android Studio projects):
|
||||
|
||||
- Edit the app/build.gradle file to add:
|
||||
|
||||
android {
|
||||
buildFeatures {
|
||||
prefab true
|
||||
}
|
||||
}
|
||||
|
||||
and
|
||||
|
||||
dependencies {
|
||||
implementation fileTree(dir:'path/to/aar/',include:['libsodium-$SODIUM_VERSION.aar'])
|
||||
}
|
||||
|
||||
Optionally, store multiple AAR files in the same folder and include '*.aar'
|
||||
|
||||
- Edit your module's CMakeLists.txt file to add:
|
||||
|
||||
find_package(sodium REQUIRED CONFIG)
|
||||
|
||||
- Then, specify 'sodium::x' as an item in the relevant 'target_link_libraries' statement.
|
||||
The first part is the AAR name and should be 'sodium'.
|
||||
The second part ('x', to be replaced) should be set to:
|
||||
- 'sodium' for the full shared library,
|
||||
- 'sodium-static' for the full static library
|
||||
- 'sodium-minimal' for the minimal shared library, or
|
||||
- 'sodium-minimal-static' for the minimal static library."
|
||||
2
deps/libsodium/dist-build/android-armv7-a.sh
vendored
2
deps/libsodium/dist-build/android-armv7-a.sh
vendored
@ -1,4 +1,4 @@
|
||||
#!/bin/sh
|
||||
export TARGET_ARCH=armv7-a
|
||||
export CFLAGS="-Os -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -marm -march=${TARGET_ARCH}"
|
||||
ARCH=arm HOST_COMPILER=arm-linux-androideabi "$(dirname "$0")/android-build.sh"
|
||||
ARCH=arm HOST_COMPILER=armv7a-linux-androideabi "$(dirname "$0")/android-build.sh"
|
||||
|
||||
2
deps/libsodium/dist-build/android-armv8-a.sh
vendored
2
deps/libsodium/dist-build/android-armv8-a.sh
vendored
@ -1,4 +1,4 @@
|
||||
#!/bin/sh
|
||||
export TARGET_ARCH=armv8-a
|
||||
export TARGET_ARCH=armv8-a+crypto
|
||||
export CFLAGS="-Os -march=${TARGET_ARCH}"
|
||||
NDK_PLATFORM=android-21 ARCH=arm64 HOST_COMPILER=aarch64-linux-android "$(dirname "$0")/android-build.sh"
|
||||
|
||||
64
deps/libsodium/dist-build/android-build.sh
vendored
64
deps/libsodium/dist-build/android-build.sh
vendored
@ -1,11 +1,11 @@
|
||||
#! /bin/sh
|
||||
|
||||
if [ -z "$NDK_PLATFORM" ]; then
|
||||
export NDK_PLATFORM="android-16"
|
||||
export NDK_PLATFORM="android-19"
|
||||
fi
|
||||
export NDK_PLATFORM_COMPAT="${NDK_PLATFORM_COMPAT:-${NDK_PLATFORM}}"
|
||||
export NDK_API_VERSION=$(echo "$NDK_PLATFORM" | sed 's/^android-//')
|
||||
export NDK_API_VERSION_COMPAT=$(echo "$NDK_PLATFORM_COMPAT" | sed 's/^android-//')
|
||||
export NDK_API_VERSION="$(echo "$NDK_PLATFORM" | sed 's/^android-//')"
|
||||
export NDK_API_VERSION_COMPAT="$(echo "$NDK_PLATFORM_COMPAT" | sed 's/^android-//')"
|
||||
|
||||
if [ -z "$ANDROID_NDK_HOME" ]; then
|
||||
echo "You should probably set ANDROID_NDK_HOME to the directory containing"
|
||||
@ -18,20 +18,19 @@ if [ ! -f ./configure ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "x$TARGET_ARCH" = 'x' ] || [ "x$ARCH" = 'x' ] || [ "x$HOST_COMPILER" = 'x' ]; then
|
||||
if [ -z "$TARGET_ARCH" ] || [ -z "$ARCH" ] || [ -z "$HOST_COMPILER" ]; then
|
||||
echo "You shouldn't use android-build.sh directly, use android-[arch].sh instead" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
export MAKE_TOOLCHAIN="${ANDROID_NDK_HOME}/build/tools/make_standalone_toolchain.py"
|
||||
|
||||
export PREFIX="$(pwd)/libsodium-android-${TARGET_ARCH}"
|
||||
export TOOLCHAIN_DIR="$(pwd)/android-toolchain-${TARGET_ARCH}"
|
||||
export TOOLCHAIN_OS_DIR="$(uname | tr '[:upper:]' '[:lower:]')-x86_64/"
|
||||
export TOOLCHAIN_DIR="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/${TOOLCHAIN_OS_DIR}"
|
||||
echo "$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/${TOOLCHAIN_OS_DIR}/${HOST_COMPILER}"
|
||||
|
||||
export PATH="${PATH}:${TOOLCHAIN_DIR}/bin"
|
||||
|
||||
export CC=${CC:-"${HOST_COMPILER}-clang"}
|
||||
|
||||
rm -rf "${TOOLCHAIN_DIR}" "${PREFIX}"
|
||||
SDK_VERSION_NUM=$(echo $NDK_PLATFORM | cut -d'-' -f2)
|
||||
export CC=${CC:-"${HOST_COMPILER}${SDK_VERSION_NUM}-clang"}
|
||||
|
||||
echo
|
||||
echo "Warnings related to headers being present but not usable are due to functions"
|
||||
@ -47,9 +46,6 @@ else
|
||||
fi
|
||||
echo
|
||||
|
||||
env - PATH="$PATH" \
|
||||
"$MAKE_TOOLCHAIN" --force --api="$NDK_API_VERSION_COMPAT" \
|
||||
--arch="$ARCH" --install-dir="$TOOLCHAIN_DIR" || exit 1
|
||||
|
||||
if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
|
||||
export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
|
||||
@ -58,29 +54,28 @@ else
|
||||
fi
|
||||
|
||||
./configure \
|
||||
--disable-soname-versions \
|
||||
--disable-pie \
|
||||
${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
|
||||
--host="${HOST_COMPILER}" \
|
||||
--prefix="${PREFIX}" \
|
||||
--with-sysroot="${TOOLCHAIN_DIR}/sysroot" || exit 1
|
||||
|
||||
if [ "$NDK_PLATFORM" != "$NDK_PLATFORM_COMPAT" ]; then
|
||||
egrep '^#define ' config.log | sort -u >config-def-compat.log
|
||||
echo
|
||||
echo "Configuring again for platform [${NDK_PLATFORM}]"
|
||||
echo
|
||||
|
||||
./configure \
|
||||
--disable-soname-versions \
|
||||
--disable-pie \
|
||||
${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
|
||||
--host="${HOST_COMPILER}" \
|
||||
--prefix="${PREFIX}" \
|
||||
--with-sysroot="${TOOLCHAIN_DIR}/sysroot" || exit 1
|
||||
|
||||
if [ "$NDK_PLATFORM" != "$NDK_PLATFORM_COMPAT" ]; then
|
||||
egrep '^#define ' config.log | sort -u > config-def-compat.log
|
||||
echo
|
||||
echo "Configuring again for platform [${NDK_PLATFORM}]"
|
||||
echo
|
||||
env - PATH="$PATH" \
|
||||
"$MAKE_TOOLCHAIN" --force --api="$NDK_API_VERSION" \
|
||||
--arch="$ARCH" --install-dir="$TOOLCHAIN_DIR" || exit 1
|
||||
|
||||
./configure \
|
||||
--disable-soname-versions \
|
||||
${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
|
||||
--host="${HOST_COMPILER}" \
|
||||
--prefix="${PREFIX}" \
|
||||
--with-sysroot="${TOOLCHAIN_DIR}/sysroot" || exit 1
|
||||
|
||||
egrep '^#define ' config.log | sort -u > config-def.log
|
||||
grep -E '^#define ' config.log | sort -u >config-def.log
|
||||
if ! cmp config-def.log config-def-compat.log; then
|
||||
echo "Platform [${NDK_PLATFORM}] is not backwards-compatible with [${NDK_PLATFORM_COMPAT}]" >&2
|
||||
diff -u config-def.log config-def-compat.log >&2
|
||||
@ -89,10 +84,9 @@ if [ "$NDK_PLATFORM" != "$NDK_PLATFORM_COMPAT" ]; then
|
||||
rm -f config-def.log config-def-compat.log
|
||||
fi
|
||||
|
||||
|
||||
NPROCESSORS=$(getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null)
|
||||
PROCESSORS=${NPROCESSORS:-3}
|
||||
|
||||
make clean && \
|
||||
make -j${PROCESSORS} install && \
|
||||
echo "libsodium has been installed into ${PREFIX}"
|
||||
make clean &&
|
||||
make -j${PROCESSORS} install &&
|
||||
echo "libsodium has been installed into ${PREFIX}"
|
||||
|
||||
211
deps/libsodium/dist-build/apple-xcframework.sh
vendored
211
deps/libsodium/dist-build/apple-xcframework.sh
vendored
@ -11,6 +11,7 @@ export IOS_SIMULATOR_I386_PREFIX="${PREFIX}/tmp/ios-simulator-i386"
|
||||
export IOS_SIMULATOR_X86_64_PREFIX="${PREFIX}/tmp/ios-simulator-x86_64"
|
||||
export WATCHOS32_PREFIX="${PREFIX}/tmp/watchos32"
|
||||
export WATCHOS64_32_PREFIX="${PREFIX}/tmp/watchos64_32"
|
||||
export WATCHOS64_PREFIX="${PREFIX}/tmp/watchos64"
|
||||
export WATCHOS_SIMULATOR_ARM64_PREFIX="${PREFIX}/tmp/watchos-simulator-arm64"
|
||||
export WATCHOS_SIMULATOR_I386_PREFIX="${PREFIX}/tmp/watchos-simulator-i386"
|
||||
export WATCHOS_SIMULATOR_X86_64_PREFIX="${PREFIX}/tmp/watchos-simulator-x86_64"
|
||||
@ -35,6 +36,12 @@ echo "Warnings related to headers being present but not usable are due to functi
|
||||
echo "that didn't exist in the specified minimum iOS version level."
|
||||
echo "They can be safely ignored."
|
||||
echo
|
||||
echo "Define the LIBSODIUM_FULL_BUILD environment variable to build the full"
|
||||
echo "library (including all deprecated/undocumented/low-level functions)."
|
||||
echo
|
||||
echo "Define the LIBSODIUM_SKIP_SIMULATORS environment variable to skip building"
|
||||
echo "the simulators libraries (iOS, watchOS, tvOS simulators)."
|
||||
echo
|
||||
|
||||
if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
|
||||
export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
|
||||
@ -87,8 +94,8 @@ build_ios() {
|
||||
export SDK="${BASEDIR}/SDKs/iPhoneOS.sdk"
|
||||
|
||||
## 32-bit iOS
|
||||
export CFLAGS="-fembed-bitcode -O2 -mthumb -arch armv7 -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}"
|
||||
export LDFLAGS="-fembed-bitcode -mthumb -arch armv7 -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}"
|
||||
export CFLAGS="-O2 -mthumb -arch armv7 -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}"
|
||||
export LDFLAGS="-mthumb -arch armv7 -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}"
|
||||
|
||||
make distclean >/dev/null 2>&1
|
||||
./configure --host=arm-apple-darwin10 --prefix="$IOS32_PREFIX" \
|
||||
@ -96,8 +103,8 @@ build_ios() {
|
||||
make -j${PROCESSORS} install || exit 1
|
||||
|
||||
## 32-bit armv7s iOS
|
||||
export CFLAGS="-fembed-bitcode -O2 -mthumb -arch armv7s -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}"
|
||||
export LDFLAGS="-fembed-bitcode -mthumb -arch armv7s -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}"
|
||||
export CFLAGS="-O2 -mthumb -arch armv7s -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}"
|
||||
export LDFLAGS="-mthumb -arch armv7s -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}"
|
||||
|
||||
make distclean >/dev/null 2>&1
|
||||
./configure --host=arm-apple-darwin10 --prefix="$IOS32s_PREFIX" \
|
||||
@ -105,8 +112,8 @@ build_ios() {
|
||||
make -j${PROCESSORS} install || exit 1
|
||||
|
||||
## 64-bit iOS
|
||||
export CFLAGS="-fembed-bitcode -O2 -arch arm64 -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}"
|
||||
export LDFLAGS="-fembed-bitcode -arch arm64 -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}"
|
||||
export CFLAGS="-O2 -arch arm64 -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}"
|
||||
export LDFLAGS="-arch arm64 -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}"
|
||||
|
||||
make distclean >/dev/null 2>&1
|
||||
./configure --host=arm-apple-darwin10 --prefix="$IOS64_PREFIX" \
|
||||
@ -121,8 +128,8 @@ build_ios_simulator() {
|
||||
|
||||
## arm64 simulator
|
||||
if [ "$APPLE_SILICON_SUPPORTED" = "true" ]; then
|
||||
export CFLAGS="-fembed-bitcode -O2 -arch arm64 -isysroot ${SDK} -mios-simulator-version-min=${IOS_SIMULATOR_VERSION_MIN}"
|
||||
export LDFLAGS="-fembed-bitcode -arch arm64 -isysroot ${SDK} -mios-simulator-version-min=${IOS_SIMULATOR_VERSION_MIN}"
|
||||
export CFLAGS="-O2 -arch arm64 -isysroot ${SDK} -mios-simulator-version-min=${IOS_SIMULATOR_VERSION_MIN}"
|
||||
export LDFLAGS="-arch arm64 -isysroot ${SDK} -mios-simulator-version-min=${IOS_SIMULATOR_VERSION_MIN}"
|
||||
|
||||
make distclean >/dev/null 2>&1
|
||||
./configure --host=arm-apple-darwin20 --prefix="$IOS_SIMULATOR_ARM64_PREFIX" \
|
||||
@ -131,8 +138,8 @@ build_ios_simulator() {
|
||||
fi
|
||||
|
||||
## i386 simulator
|
||||
export CFLAGS="-fembed-bitcode -O2 -arch i386 -isysroot ${SDK} -mios-simulator-version-min=${IOS_SIMULATOR_VERSION_MIN}"
|
||||
export LDFLAGS="-fembed-bitcode -arch i386 -isysroot ${SDK} -mios-simulator-version-min=${IOS_SIMULATOR_VERSION_MIN}"
|
||||
export CFLAGS="-O2 -arch i386 -isysroot ${SDK} -mios-simulator-version-min=${IOS_SIMULATOR_VERSION_MIN}"
|
||||
export LDFLAGS="-arch i386 -isysroot ${SDK} -mios-simulator-version-min=${IOS_SIMULATOR_VERSION_MIN}"
|
||||
|
||||
make distclean >/dev/null 2>&1
|
||||
./configure --host=i686-apple-darwin10 --prefix="$IOS_SIMULATOR_I386_PREFIX" \
|
||||
@ -140,8 +147,8 @@ build_ios_simulator() {
|
||||
make -j${PROCESSORS} install || exit 1
|
||||
|
||||
## x86_64 simulator
|
||||
export CFLAGS="-fembed-bitcode -O2 -arch x86_64 -isysroot ${SDK} -mios-simulator-version-min=${IOS_SIMULATOR_VERSION_MIN}"
|
||||
export LDFLAGS="-fembed-bitcode -arch x86_64 -isysroot ${SDK} -mios-simulator-version-min=${IOS_SIMULATOR_VERSION_MIN}"
|
||||
export CFLAGS="-O2 -arch x86_64 -isysroot ${SDK} -mios-simulator-version-min=${IOS_SIMULATOR_VERSION_MIN}"
|
||||
export LDFLAGS="-arch x86_64 -isysroot ${SDK} -mios-simulator-version-min=${IOS_SIMULATOR_VERSION_MIN}"
|
||||
|
||||
make distclean >/dev/null 2>&1
|
||||
./configure --host=x86_64-apple-darwin10 --prefix="$IOS_SIMULATOR_X86_64_PREFIX" \
|
||||
@ -155,8 +162,8 @@ build_watchos() {
|
||||
export SDK="${BASEDIR}/SDKs/WatchOS.sdk"
|
||||
|
||||
# 32-bit watchOS
|
||||
export CFLAGS="-fembed-bitcode -O2 -mthumb -arch armv7k -isysroot ${SDK} -mwatchos-version-min=${WATCHOS_VERSION_MIN}"
|
||||
export LDFLAGS="-fembed-bitcode -mthumb -arch armv7k -isysroot ${SDK} -mwatchos-version-min=${WATCHOS_VERSION_MIN}"
|
||||
export CFLAGS="-O2 -mthumb -arch armv7k -isysroot ${SDK} -mwatchos-version-min=${WATCHOS_VERSION_MIN}"
|
||||
export LDFLAGS="-mthumb -arch armv7k -isysroot ${SDK} -mwatchos-version-min=${WATCHOS_VERSION_MIN}"
|
||||
|
||||
make distclean >/dev/null 2>&1
|
||||
./configure --host=arm-apple-darwin10 --prefix="$WATCHOS32_PREFIX" \
|
||||
@ -164,13 +171,22 @@ build_watchos() {
|
||||
make -j${PROCESSORS} install || exit 1
|
||||
|
||||
## 64-bit arm64_32 watchOS
|
||||
export CFLAGS="-fembed-bitcode -O2 -mthumb -arch arm64_32 -isysroot ${SDK} -mwatchos-version-min=${WATCHOS_VERSION_MIN}"
|
||||
export LDFLAGS="-fembed-bitcode -mthumb -arch arm64_32 -isysroot ${SDK} -mwatchos-version-min=${WATCHOS_VERSION_MIN}"
|
||||
export CFLAGS="-O2 -mthumb -arch arm64_32 -isysroot ${SDK} -mwatchos-version-min=${WATCHOS_VERSION_MIN}"
|
||||
export LDFLAGS="-mthumb -arch arm64_32 -isysroot ${SDK} -mwatchos-version-min=${WATCHOS_VERSION_MIN}"
|
||||
|
||||
make distclean >/dev/null 2>&1
|
||||
./configure --host=arm-apple-darwin10 --prefix="$WATCHOS64_32_PREFIX" \
|
||||
${LIBSODIUM_ENABLE_MINIMAL_FLAG} || exit 1
|
||||
make -j${PROCESSORS} install || exit 1
|
||||
|
||||
## 64-bit arm64 watchOS
|
||||
export CFLAGS="-O2 -mthumb -arch arm64 -isysroot ${SDK} -mwatchos-version-min=${WATCHOS_VERSION_MIN}"
|
||||
export LDFLAGS="-mthumb -arch arm64 -isysroot ${SDK} -mwatchos-version-min=${WATCHOS_VERSION_MIN}"
|
||||
|
||||
make distclean >/dev/null 2>&1
|
||||
./configure --host=arm-apple-darwin10 --prefix="$WATCHOS64_PREFIX" \
|
||||
${LIBSODIUM_ENABLE_MINIMAL_FLAG} || exit 1
|
||||
make -j${PROCESSORS} install || exit 1
|
||||
}
|
||||
|
||||
build_watchos_simulator() {
|
||||
@ -180,8 +196,8 @@ build_watchos_simulator() {
|
||||
|
||||
## arm64 simulator
|
||||
if [ "$APPLE_SILICON_SUPPORTED" = "true" ]; then
|
||||
export CFLAGS="-fembed-bitcode -O2 -arch arm64 -isysroot ${SDK} -mwatchos-simulator-version-min=${WATCHOS_SIMULATOR_VERSION_MIN}"
|
||||
export LDFLAGS="-fembed-bitcode -arch arm64 -isysroot ${SDK} -mwatchos-simulator-version-min=${WATCHOS_SIMULATOR_VERSION_MIN}"
|
||||
export CFLAGS="-O2 -arch arm64 -isysroot ${SDK} -mwatchos-simulator-version-min=${WATCHOS_SIMULATOR_VERSION_MIN}"
|
||||
export LDFLAGS="-arch arm64 -isysroot ${SDK} -mwatchos-simulator-version-min=${WATCHOS_SIMULATOR_VERSION_MIN}"
|
||||
|
||||
make distclean >/dev/null 2>&1
|
||||
./configure --host=arm-apple-darwin20 --prefix="$WATCHOS_SIMULATOR_ARM64_PREFIX" \
|
||||
@ -190,8 +206,8 @@ build_watchos_simulator() {
|
||||
fi
|
||||
|
||||
## i386 simulator
|
||||
export CFLAGS="-fembed-bitcode -O2 -arch i386 -isysroot ${SDK} -mwatchos-simulator-version-min=${WATCHOS_SIMULATOR_VERSION_MIN}"
|
||||
export LDFLAGS="-fembed-bitcode -arch i386 -isysroot ${SDK} -mwatchos-simulator-version-min=${WATCHOS_SIMULATOR_VERSION_MIN}"
|
||||
export CFLAGS="-O2 -arch i386 -isysroot ${SDK} -mwatchos-simulator-version-min=${WATCHOS_SIMULATOR_VERSION_MIN}"
|
||||
export LDFLAGS="-arch i386 -isysroot ${SDK} -mwatchos-simulator-version-min=${WATCHOS_SIMULATOR_VERSION_MIN}"
|
||||
|
||||
make distclean >/dev/null 2>&1
|
||||
./configure --host=i686-apple-darwin10 --prefix="$WATCHOS_SIMULATOR_I386_PREFIX" \
|
||||
@ -199,8 +215,8 @@ build_watchos_simulator() {
|
||||
make -j${PROCESSORS} install || exit 1
|
||||
|
||||
## x86_64 simulator
|
||||
export CFLAGS="-fembed-bitcode -O2 -arch x86_64 -isysroot ${SDK} -mwatchos-simulator-version-min=${WATCHOS_SIMULATOR_VERSION_MIN}"
|
||||
export LDFLAGS="-fembed-bitcode -arch x86_64 -isysroot ${SDK} -mwatchos-simulator-version-min=${WATCHOS_SIMULATOR_VERSION_MIN}"
|
||||
export CFLAGS="-O2 -arch x86_64 -isysroot ${SDK} -mwatchos-simulator-version-min=${WATCHOS_SIMULATOR_VERSION_MIN}"
|
||||
export LDFLAGS="-arch x86_64 -isysroot ${SDK} -mwatchos-simulator-version-min=${WATCHOS_SIMULATOR_VERSION_MIN}"
|
||||
|
||||
make distclean >/dev/null 2>&1
|
||||
./configure --host=x86_64-apple-darwin10 --prefix="$WATCHOS_SIMULATOR_X86_64_PREFIX" \
|
||||
@ -214,8 +230,8 @@ build_tvos() {
|
||||
export SDK="${BASEDIR}/SDKs/AppleTVOS.sdk"
|
||||
|
||||
## 64-bit tvOS
|
||||
export CFLAGS="-fembed-bitcode -O2 -arch arm64 -isysroot ${SDK} -mtvos-version-min=${TVOS_VERSION_MIN}"
|
||||
export LDFLAGS="-fembed-bitcode -arch arm64 -isysroot ${SDK} -mtvos-version-min=${TVOS_VERSION_MIN}"
|
||||
export CFLAGS="-O2 -arch arm64 -isysroot ${SDK} -mtvos-version-min=${TVOS_VERSION_MIN}"
|
||||
export LDFLAGS="-arch arm64 -isysroot ${SDK} -mtvos-version-min=${TVOS_VERSION_MIN}"
|
||||
|
||||
make distclean >/dev/null 2>&1
|
||||
./configure --host=arm-apple-darwin10 --prefix="$TVOS64_PREFIX" \
|
||||
@ -230,8 +246,8 @@ build_tvos_simulator() {
|
||||
|
||||
## arm64 simulator
|
||||
if [ "$APPLE_SILICON_SUPPORTED" = "true" ]; then
|
||||
export CFLAGS="-fembed-bitcode -O2 -arch arm64 -isysroot ${SDK} -mtvos-simulator-version-min=${TVOS_SIMULATOR_VERSION_MIN}"
|
||||
export LDFLAGS="-fembed-bitcode -arch arm64 -isysroot ${SDK} -mtvos-simulator-version-min=${TVOS_SIMULATOR_VERSION_MIN}"
|
||||
export CFLAGS="-O2 -arch arm64 -isysroot ${SDK} -mtvos-simulator-version-min=${TVOS_SIMULATOR_VERSION_MIN}"
|
||||
export LDFLAGS="-arch arm64 -isysroot ${SDK} -mtvos-simulator-version-min=${TVOS_SIMULATOR_VERSION_MIN}"
|
||||
|
||||
make distclean >/dev/null 2>&1
|
||||
./configure --host=arm-apple-darwin20 --prefix="$TVOS_SIMULATOR_ARM64_PREFIX" \
|
||||
@ -240,8 +256,8 @@ build_tvos_simulator() {
|
||||
fi
|
||||
|
||||
## x86_64 simulator
|
||||
export CFLAGS="-fembed-bitcode -O2 -arch x86_64 -isysroot ${SDK} -mtvos-simulator-version-min=${TVOS_SIMULATOR_VERSION_MIN}"
|
||||
export LDFLAGS="-fembed-bitcode -arch x86_64 -isysroot ${SDK} -mtvos-simulator-version-min=${TVOS_SIMULATOR_VERSION_MIN}"
|
||||
export CFLAGS="-O2 -arch x86_64 -isysroot ${SDK} -mtvos-simulator-version-min=${TVOS_SIMULATOR_VERSION_MIN}"
|
||||
export LDFLAGS="-arch x86_64 -isysroot ${SDK} -mtvos-simulator-version-min=${TVOS_SIMULATOR_VERSION_MIN}"
|
||||
|
||||
make distclean >/dev/null 2>&1
|
||||
./configure --host=x86_64-apple-darwin10 --prefix="$TVOS_SIMULATOR_X86_64_PREFIX" \
|
||||
@ -276,23 +292,29 @@ build_catalyst() {
|
||||
}
|
||||
|
||||
mkdir -p "${PREFIX}/tmp"
|
||||
|
||||
echo "Building for macOS..."
|
||||
build_macos >"$LOG_FILE" 2>&1 || exit 1
|
||||
echo "Building for iOS..."
|
||||
build_ios >"$LOG_FILE" 2>&1 || exit 1
|
||||
echo "Building for the iOS simulator..."
|
||||
build_ios_simulator >"$LOG_FILE" 2>&1 || exit 1
|
||||
echo "Building for watchOS..."
|
||||
build_watchos >"$LOG_FILE" 2>&1 || exit 1
|
||||
echo "Building for the watchOS simulator..."
|
||||
build_watchos_simulator >"$LOG_FILE" 2>&1 || exit 1
|
||||
echo "Building for tvOS..."
|
||||
build_tvos >"$LOG_FILE" 2>&1 || exit 1
|
||||
echo "Building for the tvOS simulator..."
|
||||
build_tvos_simulator >"$LOG_FILE" 2>&1 || exit 1
|
||||
echo "Building for Catalyst..."
|
||||
build_catalyst >"$LOG_FILE" 2>&1 || exit 1
|
||||
|
||||
if [ -z "$LIBSODIUM_SKIP_SIMULATORS" ]; then
|
||||
echo "Building for the iOS simulator..."
|
||||
build_ios_simulator >"$LOG_FILE" 2>&1 || exit 1
|
||||
echo "Building for the watchOS simulator..."
|
||||
build_watchos_simulator >"$LOG_FILE" 2>&1 || exit 1
|
||||
echo "Building for the tvOS simulator..."
|
||||
build_tvos_simulator >"$LOG_FILE" 2>&1 || exit 1
|
||||
else
|
||||
echo "[Skipping the simulators]"
|
||||
fi
|
||||
|
||||
echo "Adding the Clibsodium module map for Swift..."
|
||||
|
||||
find "$PREFIX" -name "include" -type d -print | while read -r f; do
|
||||
@ -328,25 +350,6 @@ for ext in a dylib; do
|
||||
-output "$PREFIX/ios/lib/libsodium.${ext}"
|
||||
done
|
||||
|
||||
echo "Bundling iOS simulators..."
|
||||
|
||||
mkdir -p "${PREFIX}/ios-simulators/lib"
|
||||
cp -a "${IOS_SIMULATOR_X86_64_PREFIX}/include" "${PREFIX}/ios-simulators/"
|
||||
for ext in a dylib; do
|
||||
if [ "$APPLE_SILICON_SUPPORTED" = "true" ]; then
|
||||
lipo -create \
|
||||
"${IOS_SIMULATOR_ARM64_PREFIX}/lib/libsodium.${ext}" \
|
||||
"${IOS_SIMULATOR_I386_PREFIX}/lib/libsodium.${ext}" \
|
||||
"${IOS_SIMULATOR_X86_64_PREFIX}/lib/libsodium.${ext}" \
|
||||
-output "${PREFIX}/ios-simulators/lib/libsodium.${ext}" || exit 1
|
||||
else
|
||||
lipo -create \
|
||||
"${IOS_SIMULATOR_I386_PREFIX}/lib/libsodium.${ext}" \
|
||||
"${IOS_SIMULATOR_X86_64_PREFIX}/lib/libsodium.${ext}" \
|
||||
-output "${PREFIX}/ios-simulators/lib/libsodium.${ext}" || exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
echo "Bundling watchOS targets..."
|
||||
|
||||
mkdir -p "${PREFIX}/watchos/lib"
|
||||
@ -355,28 +358,10 @@ for ext in a dylib; do
|
||||
lipo -create \
|
||||
"${WATCHOS32_PREFIX}/lib/libsodium.${ext}" \
|
||||
"${WATCHOS64_32_PREFIX}/lib/libsodium.${ext}" \
|
||||
"${WATCHOS64_PREFIX}/lib/libsodium.${ext}" \
|
||||
-output "${PREFIX}/watchos/lib/libsodium.${ext}"
|
||||
done
|
||||
|
||||
echo "Bundling watchOS simulators..."
|
||||
|
||||
mkdir -p "${PREFIX}/watchos-simulators/lib"
|
||||
cp -a "${WATCHOS_SIMULATOR_X86_64_PREFIX}/include" "${PREFIX}/watchos-simulators/"
|
||||
for ext in a dylib; do
|
||||
if [ "$APPLE_SILICON_SUPPORTED" = "true" ]; then
|
||||
lipo -create \
|
||||
"${WATCHOS_SIMULATOR_ARM64_PREFIX}/lib/libsodium.${ext}" \
|
||||
"${WATCHOS_SIMULATOR_I386_PREFIX}/lib/libsodium.${ext}" \
|
||||
"${WATCHOS_SIMULATOR_X86_64_PREFIX}/lib/libsodium.${ext}" \
|
||||
-output "${PREFIX}/watchos-simulators/lib/libsodium.${ext}"
|
||||
else
|
||||
lipo -create \
|
||||
"${WATCHOS_SIMULATOR_I386_PREFIX}/lib/libsodium.${ext}" \
|
||||
"${WATCHOS_SIMULATOR_X86_64_PREFIX}/lib/libsodium.${ext}" \
|
||||
-output "${PREFIX}/watchos-simulators/lib/libsodium.${ext}"
|
||||
fi
|
||||
done
|
||||
|
||||
echo "Bundling tvOS targets..."
|
||||
|
||||
mkdir -p "${PREFIX}/tvos/lib"
|
||||
@ -387,23 +372,6 @@ for ext in a dylib; do
|
||||
-output "$PREFIX/tvos/lib/libsodium.${ext}"
|
||||
done
|
||||
|
||||
echo "Bundling tvOS simulators..."
|
||||
|
||||
mkdir -p "${PREFIX}/tvos-simulators/lib"
|
||||
cp -a "${TVOS_SIMULATOR_X86_64_PREFIX}/include" "${PREFIX}/tvos-simulators/"
|
||||
for ext in a dylib; do
|
||||
if [ "$APPLE_SILICON_SUPPORTED" = "true" ]; then
|
||||
lipo -create \
|
||||
"${TVOS_SIMULATOR_ARM64_PREFIX}/lib/libsodium.${ext}" \
|
||||
"${TVOS_SIMULATOR_X86_64_PREFIX}/lib/libsodium.${ext}" \
|
||||
-output "${PREFIX}/tvos-simulators/lib/libsodium.${ext}" || exit 1
|
||||
else
|
||||
lipo -create \
|
||||
"${TVOS_SIMULATOR_X86_64_PREFIX}/lib/libsodium.${ext}" \
|
||||
-output "${PREFIX}/tvos-simulators/lib/libsodium.${ext}" || exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
echo "Bundling Catalyst targets..."
|
||||
|
||||
mkdir -p "${PREFIX}/catalyst/lib"
|
||||
@ -424,15 +392,78 @@ for ext in a dylib; do
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -z "$LIBSODIUM_SKIP_SIMULATORS" ]; then
|
||||
echo "Bundling iOS simulators..."
|
||||
|
||||
mkdir -p "${PREFIX}/ios-simulators/lib"
|
||||
cp -a "${IOS_SIMULATOR_X86_64_PREFIX}/include" "${PREFIX}/ios-simulators/"
|
||||
for ext in a dylib; do
|
||||
if [ "$APPLE_SILICON_SUPPORTED" = "true" ]; then
|
||||
lipo -create \
|
||||
"${IOS_SIMULATOR_ARM64_PREFIX}/lib/libsodium.${ext}" \
|
||||
"${IOS_SIMULATOR_I386_PREFIX}/lib/libsodium.${ext}" \
|
||||
"${IOS_SIMULATOR_X86_64_PREFIX}/lib/libsodium.${ext}" \
|
||||
-output "${PREFIX}/ios-simulators/lib/libsodium.${ext}" || exit 1
|
||||
else
|
||||
lipo -create \
|
||||
"${IOS_SIMULATOR_I386_PREFIX}/lib/libsodium.${ext}" \
|
||||
"${IOS_SIMULATOR_X86_64_PREFIX}/lib/libsodium.${ext}" \
|
||||
-output "${PREFIX}/ios-simulators/lib/libsodium.${ext}" || exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
echo "Bundling watchOS simulators..."
|
||||
|
||||
mkdir -p "${PREFIX}/watchos-simulators/lib"
|
||||
cp -a "${WATCHOS_SIMULATOR_X86_64_PREFIX}/include" "${PREFIX}/watchos-simulators/"
|
||||
for ext in a dylib; do
|
||||
if [ "$APPLE_SILICON_SUPPORTED" = "true" ]; then
|
||||
lipo -create \
|
||||
"${WATCHOS_SIMULATOR_ARM64_PREFIX}/lib/libsodium.${ext}" \
|
||||
"${WATCHOS_SIMULATOR_I386_PREFIX}/lib/libsodium.${ext}" \
|
||||
"${WATCHOS_SIMULATOR_X86_64_PREFIX}/lib/libsodium.${ext}" \
|
||||
-output "${PREFIX}/watchos-simulators/lib/libsodium.${ext}"
|
||||
else
|
||||
lipo -create \
|
||||
"${WATCHOS_SIMULATOR_I386_PREFIX}/lib/libsodium.${ext}" \
|
||||
"${WATCHOS_SIMULATOR_X86_64_PREFIX}/lib/libsodium.${ext}" \
|
||||
-output "${PREFIX}/watchos-simulators/lib/libsodium.${ext}"
|
||||
fi
|
||||
done
|
||||
|
||||
echo "Bundling tvOS simulators..."
|
||||
|
||||
mkdir -p "${PREFIX}/tvos-simulators/lib"
|
||||
cp -a "${TVOS_SIMULATOR_X86_64_PREFIX}/include" "${PREFIX}/tvos-simulators/"
|
||||
for ext in a dylib; do
|
||||
if [ "$APPLE_SILICON_SUPPORTED" = "true" ]; then
|
||||
lipo -create \
|
||||
"${TVOS_SIMULATOR_ARM64_PREFIX}/lib/libsodium.${ext}" \
|
||||
"${TVOS_SIMULATOR_X86_64_PREFIX}/lib/libsodium.${ext}" \
|
||||
-output "${PREFIX}/tvos-simulators/lib/libsodium.${ext}" || exit 1
|
||||
else
|
||||
lipo -create \
|
||||
"${TVOS_SIMULATOR_X86_64_PREFIX}/lib/libsodium.${ext}" \
|
||||
-output "${PREFIX}/tvos-simulators/lib/libsodium.${ext}" || exit 1
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
echo "Creating Clibsodium.xcframework..."
|
||||
|
||||
rm -rf "${PREFIX}/Clibsodium.xcframework"
|
||||
|
||||
XCFRAMEWORK_ARGS=""
|
||||
for f in macos ios ios-simulators watchos watchos-simulators tvos tvos-simulators catalyst; do
|
||||
for f in macos ios watchos tvos catalyst; do
|
||||
XCFRAMEWORK_ARGS="${XCFRAMEWORK_ARGS} -library ${PREFIX}/${f}/lib/libsodium.a"
|
||||
XCFRAMEWORK_ARGS="${XCFRAMEWORK_ARGS} -headers ${PREFIX}/${f}/include"
|
||||
done
|
||||
if [ -z "$LIBSODIUM_SKIP_SIMULATORS" ]; then
|
||||
for f in ios-simulators watchos-simulators tvos-simulators; do
|
||||
XCFRAMEWORK_ARGS="${XCFRAMEWORK_ARGS} -library ${PREFIX}/${f}/lib/libsodium.a"
|
||||
XCFRAMEWORK_ARGS="${XCFRAMEWORK_ARGS} -headers ${PREFIX}/${f}/include"
|
||||
done
|
||||
fi
|
||||
xcodebuild -create-xcframework \
|
||||
${XCFRAMEWORK_ARGS} \
|
||||
-output "${PREFIX}/Clibsodium.xcframework" >/dev/null
|
||||
|
||||
50
deps/libsodium/dist-build/emscripten-symbols.def
vendored
50
deps/libsodium/dist-build/emscripten-symbols.def
vendored
@ -289,10 +289,10 @@ _crypto_onetimeauth_primitive 0 1
|
||||
_crypto_onetimeauth_statebytes 0 1
|
||||
_crypto_onetimeauth_update 0 1
|
||||
_crypto_onetimeauth_verify 0 1
|
||||
_crypto_pwhash 1 1
|
||||
_crypto_pwhash_alg_argon2i13 1 1
|
||||
_crypto_pwhash_alg_argon2id13 1 1
|
||||
_crypto_pwhash_alg_default 1 1
|
||||
_crypto_pwhash 0 1
|
||||
_crypto_pwhash_alg_argon2i13 0 1
|
||||
_crypto_pwhash_alg_argon2id13 0 1
|
||||
_crypto_pwhash_alg_default 0 1
|
||||
_crypto_pwhash_argon2i 0 1
|
||||
_crypto_pwhash_argon2i_alg_argon2i13 0 1
|
||||
_crypto_pwhash_argon2i_bytes_max 0 1
|
||||
@ -337,22 +337,22 @@ _crypto_pwhash_argon2id_str_needs_rehash 0 1
|
||||
_crypto_pwhash_argon2id_str_verify 0 1
|
||||
_crypto_pwhash_argon2id_strbytes 0 1
|
||||
_crypto_pwhash_argon2id_strprefix 0 1
|
||||
_crypto_pwhash_bytes_max 1 1
|
||||
_crypto_pwhash_bytes_min 1 1
|
||||
_crypto_pwhash_memlimit_interactive 1 1
|
||||
_crypto_pwhash_memlimit_max 1 1
|
||||
_crypto_pwhash_memlimit_min 1 1
|
||||
_crypto_pwhash_memlimit_moderate 1 1
|
||||
_crypto_pwhash_memlimit_sensitive 1 1
|
||||
_crypto_pwhash_opslimit_interactive 1 1
|
||||
_crypto_pwhash_opslimit_max 1 1
|
||||
_crypto_pwhash_opslimit_min 1 1
|
||||
_crypto_pwhash_opslimit_moderate 1 1
|
||||
_crypto_pwhash_opslimit_sensitive 1 1
|
||||
_crypto_pwhash_passwd_max 1 1
|
||||
_crypto_pwhash_passwd_min 1 1
|
||||
_crypto_pwhash_bytes_max 0 1
|
||||
_crypto_pwhash_bytes_min 0 1
|
||||
_crypto_pwhash_memlimit_interactive 0 1
|
||||
_crypto_pwhash_memlimit_max 0 1
|
||||
_crypto_pwhash_memlimit_min 0 1
|
||||
_crypto_pwhash_memlimit_moderate 0 1
|
||||
_crypto_pwhash_memlimit_sensitive 0 1
|
||||
_crypto_pwhash_opslimit_interactive 0 1
|
||||
_crypto_pwhash_opslimit_max 0 1
|
||||
_crypto_pwhash_opslimit_min 0 1
|
||||
_crypto_pwhash_opslimit_moderate 0 1
|
||||
_crypto_pwhash_opslimit_sensitive 0 1
|
||||
_crypto_pwhash_passwd_max 0 1
|
||||
_crypto_pwhash_passwd_min 0 1
|
||||
_crypto_pwhash_primitive 0 1
|
||||
_crypto_pwhash_saltbytes 1 1
|
||||
_crypto_pwhash_saltbytes 0 1
|
||||
_crypto_pwhash_scryptsalsa208sha256 0 1
|
||||
_crypto_pwhash_scryptsalsa208sha256_bytes_max 0 1
|
||||
_crypto_pwhash_scryptsalsa208sha256_bytes_min 0 1
|
||||
@ -373,12 +373,12 @@ _crypto_pwhash_scryptsalsa208sha256_str_needs_rehash 0 1
|
||||
_crypto_pwhash_scryptsalsa208sha256_str_verify 0 1
|
||||
_crypto_pwhash_scryptsalsa208sha256_strbytes 0 1
|
||||
_crypto_pwhash_scryptsalsa208sha256_strprefix 0 1
|
||||
_crypto_pwhash_str 1 1
|
||||
_crypto_pwhash_str_alg 1 1
|
||||
_crypto_pwhash_str_needs_rehash 1 1
|
||||
_crypto_pwhash_str_verify 1 1
|
||||
_crypto_pwhash_strbytes 1 1
|
||||
_crypto_pwhash_strprefix 1 1
|
||||
_crypto_pwhash_str 0 1
|
||||
_crypto_pwhash_str_alg 0 1
|
||||
_crypto_pwhash_str_needs_rehash 0 1
|
||||
_crypto_pwhash_str_verify 0 1
|
||||
_crypto_pwhash_strbytes 0 1
|
||||
_crypto_pwhash_strprefix 0 1
|
||||
_crypto_scalarmult 1 1
|
||||
_crypto_scalarmult_base 1 1
|
||||
_crypto_scalarmult_bytes 1 1
|
||||
|
||||
107
deps/libsodium/dist-build/emscripten.sh
vendored
107
deps/libsodium/dist-build/emscripten.sh
vendored
File diff suppressed because one or more lines are too long
@ -2,6 +2,8 @@
|
||||
|
||||
set -e
|
||||
|
||||
LIBSODIUM=${LIBSODIUM:-/tmp/sodium/lib/libsodium.23.dylib}
|
||||
|
||||
symbols() {
|
||||
{
|
||||
SUMO="$1"
|
||||
@ -17,9 +19,9 @@ symbols() {
|
||||
fi
|
||||
done < emscripten-symbols.def
|
||||
|
||||
/usr/bin/nm /usr/local/lib/libsodium.23.dylib | \
|
||||
fgrep ' T _' | \
|
||||
cut -d' ' -f3 | {
|
||||
/usr/bin/nm "$LIBSODIUM" |
|
||||
fgrep ' T _' |
|
||||
cut -d' ' -f3 | {
|
||||
while read symbol; do
|
||||
eval "found=\$defined_${symbol}"
|
||||
if [ "$found" = "yes" ]; then
|
||||
|
||||
6
deps/libsodium/dist-build/wasm32-wasi.sh
vendored
6
deps/libsodium/dist-build/wasm32-wasi.sh
vendored
@ -7,8 +7,8 @@ export PREFIX="$(pwd)/libsodium-wasm32-wasi"
|
||||
mkdir -p $PREFIX || exit 1
|
||||
|
||||
export CC="zig cc"
|
||||
export CFLAGS="--target=wasm32-wasi -O2"
|
||||
export LDFLAGS="-s -Wl,--stack-first"
|
||||
export CFLAGS="--target=wasm32-wasi -O3"
|
||||
export LDFLAGS="-s"
|
||||
export AR="zig ar"
|
||||
export RANLIB="zig ranlib"
|
||||
|
||||
@ -16,7 +16,7 @@ make distclean >/dev/null
|
||||
|
||||
if [ "x$1" = "x--bench" ]; then
|
||||
export BENCHMARKS=1
|
||||
export CPPFLAGS="-DBENCHMARKS -DITERATIONS=100"
|
||||
export CPPFLAGS="-DBENCHMARKS -DITERATIONS=200"
|
||||
else
|
||||
export CPPFLAGS="-DED25519_NONDETERMINISTIC=1"
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user