diff --git a/platform-darwin/Scripts/build_libjson-c-ios b/platform-darwin/Scripts/build_libjson-c-ios index 230738d5..28a5ee15 100755 --- a/platform-darwin/Scripts/build_libjson-c-ios +++ b/platform-darwin/Scripts/build_libjson-c-ios @@ -1,11 +1,15 @@ #!/usr/bin/env bash set -e +hash automake || { echo >&2 "Missing automake."; exit 1; } +hash autoreconf || { echo >&2 "Missing autoconf."; exit 1; } +hash libtool || hash glibtool || { echo >&2 "Missing libtool."; exit 1; } + cd "${BASH_SOURCE%/*}/../External/libjson-c" [[ -e "${prefix=$PWD/libjson-c-ios}/lib/libjson-c.a" ]] && exit # Prepare -autoreconf -Iautoconf-archive/m4 --verbose --install --symlink 2>&1 | sed 's/^\([^:]*\):[0-9]\{1,\}: /\1: /' +autoreconf -Iautoconf-archive/m4 --verbose --install --symlink 2> >(sed 's/^\([^:]*\):[0-9]\{1,\}: /\1: /') rm -rf "${prefix=$PWD/libjson-c-ios}" mkdir -p "$prefix/lib" \ "${prefix_i386=$prefix/tmp/i386}" \ @@ -17,8 +21,8 @@ mkdir -p "$prefix/lib" \ # Targets ( ## ARCH: i386 - export SDKROOT="$(xcrun --show-sdk-path --sdk iphonesimulator)" - export PATH="$(xcrun --show-sdk-platform-path --sdk iphonesimulator)/usr/bin:$PATH" + SDKROOT="$(xcrun --show-sdk-path --sdk iphonesimulator)" + PATH="$(xcrun --show-sdk-platform-path --sdk iphonesimulator)/usr/bin:$PATH" export CFLAGS="-arch i386 -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g $CFLAGS" export LDFLAGS="-arch i386 -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $LDFLAGS" export CPPFLAGS="$CFLAGS $CPPFLAGS" @@ -28,8 +32,8 @@ mkdir -p "$prefix/lib" \ ) ( ## ARCH: x86_64 - export SDKROOT="$(xcrun --show-sdk-path --sdk iphonesimulator)" - export PATH="$(xcrun --show-sdk-platform-path --sdk iphonesimulator)/usr/bin:$PATH" + SDKROOT="$(xcrun --show-sdk-path --sdk iphonesimulator)" + PATH="$(xcrun --show-sdk-platform-path --sdk iphonesimulator)/usr/bin:$PATH" export CFLAGS="-arch x86_64 -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g $CFLAGS" export LDFLAGS="-arch x86_64 -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $LDFLAGS" export CPPFLAGS="$CFLAGS $CPPFLAGS" @@ -39,8 +43,8 @@ mkdir -p "$prefix/lib" \ ) ( ## ARCH: armv7 - export SDKROOT="$(xcrun --show-sdk-path --sdk iphoneos)" - export PATH="$(xcrun --show-sdk-platform-path --sdk iphoneos)/usr/bin:$PATH" + SDKROOT="$(xcrun --show-sdk-path --sdk iphoneos)" + PATH="$(xcrun --show-sdk-platform-path --sdk iphoneos)/usr/bin:$PATH" export CFLAGS="-mthumb -arch armv7 -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g $CFLAGS" export LDFLAGS="-mthumb -arch armv7 -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $LDFLAGS" export CPPFLAGS="$CFLAGS $CPPFLAGS" @@ -50,8 +54,8 @@ mkdir -p "$prefix/lib" \ ) ( ## ARCH: armv7s - export SDKROOT="$(xcrun --show-sdk-path --sdk iphoneos)" - export PATH="$(xcrun --show-sdk-platform-path --sdk iphoneos)/usr/bin:$PATH" + SDKROOT="$(xcrun --show-sdk-path --sdk iphoneos)" + PATH="$(xcrun --show-sdk-platform-path --sdk iphoneos)/usr/bin:$PATH" export CFLAGS="-mthumb -arch armv7s -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g $CFLAGS" export LDFLAGS="-mthumb -arch armv7s -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $LDFLAGS" export CPPFLAGS="$CFLAGS $CPPFLAGS" @@ -61,8 +65,8 @@ mkdir -p "$prefix/lib" \ ) ( ## ARCH: arm64 - export SDKROOT="$(xcrun --show-sdk-path --sdk iphoneos)" - export PATH="$(xcrun --show-sdk-platform-path --sdk iphoneos)/usr/bin:$PATH" + SDKROOT="$(xcrun --show-sdk-path --sdk iphoneos)" + PATH="$(xcrun --show-sdk-platform-path --sdk iphoneos)/usr/bin:$PATH" export CFLAGS="-mthumb -arch arm64 -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g $CFLAGS" export LDFLAGS="-mthumb -arch arm64 -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} $LDFLAGS" export CPPFLAGS="$CFLAGS $CPPFLAGS" diff --git a/platform-darwin/Scripts/build_libjson-c-osx b/platform-darwin/Scripts/build_libjson-c-osx index 4a617771..2b6d013f 100755 --- a/platform-darwin/Scripts/build_libjson-c-osx +++ b/platform-darwin/Scripts/build_libjson-c-osx @@ -1,19 +1,23 @@ #!/usr/bin/env bash set -e +hash automake || { echo >&2 "Missing automake."; exit 1; } +hash autoreconf || { echo >&2 "Missing autoconf."; exit 1; } +hash libtool || hash glibtool || { echo >&2 "Missing libtool."; exit 1; } + cd "${BASH_SOURCE%/*}/../External/libjson-c" [[ -e "${prefix=$PWD/libjson-c-osx}/lib/libjson-c.a" ]] && exit # Prepare -autoreconf -Iautoconf-archive/m4 --verbose --install --symlink 2>&1 | sed 's/^\([^:]*\):[0-9]\{1,\}: /\1: /' +autoreconf -Iautoconf-archive/m4 --verbose --install --symlink 2> >(sed 's/^\([^:]*\):[0-9]\{1,\}: /\1: /') rm -rf "${prefix=$PWD/libjson-c-osx}" mkdir -p "$prefix" # Targets ( ## ARCH: x86_64 - export SDKROOT="$(xcrun --show-sdk-path --sdk macosx)" - export PATH="$(xcrun --show-sdk-platform-path --sdk macosx)/usr/bin:$PATH" + SDKROOT="$(xcrun --show-sdk-path --sdk macosx)" + PATH="$(xcrun --show-sdk-platform-path --sdk macosx)/usr/bin:$PATH" export CFLAGS="-arch x86_64 -isysroot $SDKROOT -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET:-10.8} -O2 -g $CFLAGS" # -flto export LDFLAGS="-arch x86_64 -isysroot $SDKROOT -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET:-10.8} $LDFLAGS" # -flto export CPPFLAGS="$CFLAGS $CPPFLAGS" diff --git a/platform-darwin/Scripts/build_libsodium-ios b/platform-darwin/Scripts/build_libsodium-ios index 9cfd4279..abd4b8f1 100755 --- a/platform-darwin/Scripts/build_libsodium-ios +++ b/platform-darwin/Scripts/build_libsodium-ios @@ -1,11 +1,15 @@ #!/usr/bin/env bash set -e +hash automake || { echo >&2 "Missing automake."; exit 1; } +hash autoreconf || { echo >&2 "Missing autoconf."; exit 1; } +hash libtool || hash glibtool || { echo >&2 "Missing libtool."; exit 1; } + cd "${BASH_SOURCE%/*}/../External/libsodium" [[ -e "${prefix=$PWD/libsodium-ios}/lib/libsodium.a" ]] && exit # Prepare -autoreconf --verbose --install --symlink 2>&1 | sed 's/^\([^:]*\):[0-9]\{1,\}: /\1: /' +autoreconf --verbose --install --symlink 2> >(sed 's/^\([^:]*\):[0-9]\{1,\}: /\1: /') rm -rf "${prefix=$PWD/libsodium-ios}" mkdir -p "$prefix/lib" \ "${prefix_i386=$prefix/tmp/i386}" \ @@ -17,8 +21,8 @@ mkdir -p "$prefix/lib" \ # Targets ( ## ARCH: i386 - export SDKROOT="$(xcrun --show-sdk-path --sdk iphonesimulator)" - export PATH="$(xcrun --show-sdk-platform-path --sdk iphonesimulator)/usr/bin:$PATH" + SDKROOT="$(xcrun --show-sdk-path --sdk iphonesimulator)" + PATH="$(xcrun --show-sdk-platform-path --sdk iphonesimulator)/usr/bin:$PATH" export CFLAGS="-arch i386 -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g -flto $CFLAGS" export LDFLAGS="-arch i386 -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -flto $LDFLAGS" export CPPFLAGS="$CFLAGS $CPPFLAGS" @@ -28,8 +32,8 @@ mkdir -p "$prefix/lib" \ ) ( ## ARCH: x86_64 - export SDKROOT="$(xcrun --show-sdk-path --sdk iphonesimulator)" - export PATH="$(xcrun --show-sdk-platform-path --sdk iphonesimulator)/usr/bin:$PATH" + SDKROOT="$(xcrun --show-sdk-path --sdk iphonesimulator)" + PATH="$(xcrun --show-sdk-platform-path --sdk iphonesimulator)/usr/bin:$PATH" export CFLAGS="-arch x86_64 -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g -flto $CFLAGS" export LDFLAGS="-arch x86_64 -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -flto $LDFLAGS" export CPPFLAGS="$CFLAGS $CPPFLAGS" @@ -39,8 +43,8 @@ mkdir -p "$prefix/lib" \ ) ( ## ARCH: armv7 - export SDKROOT="$(xcrun --show-sdk-path --sdk iphoneos)" - export PATH="$(xcrun --show-sdk-platform-path --sdk iphoneos)/usr/bin:$PATH" + SDKROOT="$(xcrun --show-sdk-path --sdk iphoneos)" + PATH="$(xcrun --show-sdk-platform-path --sdk iphoneos)/usr/bin:$PATH" export CFLAGS="-mthumb -arch armv7 -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g -flto $CFLAGS" export LDFLAGS="-mthumb -arch armv7 -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -flto $LDFLAGS" export CPPFLAGS="$CFLAGS $CPPFLAGS" @@ -50,8 +54,8 @@ mkdir -p "$prefix/lib" \ ) ( ## ARCH: armv7s - export SDKROOT="$(xcrun --show-sdk-path --sdk iphoneos)" - export PATH="$(xcrun --show-sdk-platform-path --sdk iphoneos)/usr/bin:$PATH" + SDKROOT="$(xcrun --show-sdk-path --sdk iphoneos)" + PATH="$(xcrun --show-sdk-platform-path --sdk iphoneos)/usr/bin:$PATH" export CFLAGS="-mthumb -arch armv7s -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g -flto $CFLAGS" export LDFLAGS="-mthumb -arch armv7s -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -flto $LDFLAGS" export CPPFLAGS="$CFLAGS $CPPFLAGS" @@ -61,8 +65,8 @@ mkdir -p "$prefix/lib" \ ) ( ## ARCH: arm64 - export SDKROOT="$(xcrun --show-sdk-path --sdk iphoneos)" - export PATH="$(xcrun --show-sdk-platform-path --sdk iphoneos)/usr/bin:$PATH" + SDKROOT="$(xcrun --show-sdk-path --sdk iphoneos)" + PATH="$(xcrun --show-sdk-platform-path --sdk iphoneos)/usr/bin:$PATH" export CFLAGS="-mthumb -arch arm64 -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g -flto $CFLAGS" export LDFLAGS="-mthumb -arch arm64 -isysroot $SDKROOT -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -flto $LDFLAGS" export CPPFLAGS="$CFLAGS $CPPFLAGS" diff --git a/platform-darwin/Scripts/build_libsodium-osx b/platform-darwin/Scripts/build_libsodium-osx index 63640193..31b64fd9 100755 --- a/platform-darwin/Scripts/build_libsodium-osx +++ b/platform-darwin/Scripts/build_libsodium-osx @@ -1,20 +1,24 @@ #!/usr/bin/env bash set -e +hash automake || { echo >&2 "Missing automake."; exit 1; } +hash autoreconf || { echo >&2 "Missing autoconf."; exit 1; } +hash libtool || hash glibtool || { echo >&2 "Missing libtool."; exit 1; } + cd "${BASH_SOURCE%/*}/../External/libsodium" [[ -e "${prefix=$PWD/libsodium-osx}/lib/libsodium.a" ]] && exit # Inspired by libsodium/dist-build/osx.sh # Prepare -autoreconf --verbose --install --symlink 2>&1 | sed 's/^\([^:]*\):[0-9]\{1,\}: /\1: /' +autoreconf --verbose --install --symlink 2> >(sed 's/^\([^:]*\):[0-9]\{1,\}: /\1: /') rm -rf "${prefix=$PWD/libsodium-osx}" mkdir -p "$prefix" # Targets ( ## ARCH: x86_64 - export SDKROOT="$(xcrun --show-sdk-path --sdk macosx)" - export PATH="$(xcrun --show-sdk-platform-path --sdk macosx)/usr/bin:$PATH" + SDKROOT="$(xcrun --show-sdk-path --sdk macosx)" + PATH="$(xcrun --show-sdk-platform-path --sdk macosx)/usr/bin:$PATH" export CFLAGS="-arch x86_64 -isysroot $SDKROOT -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET:-10.8} -O2 -g -flto $CFLAGS" export LDFLAGS="-arch x86_64 -isysroot $SDKROOT -mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET:-10.8} -flto $LDFLAGS" export CPPFLAGS="$CFLAGS $CPPFLAGS"