skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Fix ./build's targets interpretation & other improvements.

Browse Source
This commit is contained in:
Maarten Billemont
2017-09-01 11:16:09 -04:00
parent 9a5e9ced31
commit 060ce61030
7 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform-darwin/Scripts/build_libjson-c-ios
View File

@@ -2,7 +2,7 @@
set -e
cd "${BASH_SOURCE%/*}/../External/libjson-c"
[[ -d libjson-c-ios ]] && exit
[[ -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: /'
@@ -72,6 +72,7 @@ mkdir -p "$prefix/lib" \
)
# Merge Binaries
mv -f -- "$prefix_arm64/include" "$prefix/"
lipo -create \
"$prefix_i386/lib/libjson-c.a" \
"$prefix_x86_64/lib/libjson-c.a" \
@@ -79,7 +80,6 @@ lipo -create \
"$prefix_armv7s/lib/libjson-c.a" \
"$prefix_arm64/lib/libjson-c.a" \
-output "$prefix/lib/libjson-c.a"
mv -f -- "$prefix_arm64/include" "$prefix/"
# Cleanup
rm -rf -- "$prefix/tmp"

2
platform-darwin/Scripts/build_libjson-c-osx
View File

@@ -2,7 +2,7 @@
set -e
cd "${BASH_SOURCE%/*}/../External/libjson-c"
[[ -d libjson-c-osx ]] && exit
[[ -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: /'

4
platform-darwin/Scripts/build_libsodium-ios
View File

@@ -2,7 +2,7 @@
set -e
cd "${BASH_SOURCE%/*}/../External/libsodium"
[[ -d libsodium-ios ]] && exit
[[ -e "${prefix=$PWD/libsodium-ios}/lib/libsodium.a" ]] && exit
# Prepare
autoreconf --verbose --install --symlink 2>&1 | sed 's/^\([^:]*\):[0-9]\{1,\}: /\1: /'
@@ -72,6 +72,7 @@ mkdir -p "$prefix/lib" \
)
# Merge Binaries
mv -f -- "$prefix_arm64/include" "$prefix/"
lipo -create \
"$prefix_i386/lib/libsodium.a" \
"$prefix_x86_64/lib/libsodium.a" \
@@ -79,7 +80,6 @@ lipo -create \
"$prefix_armv7s/lib/libsodium.a" \
"$prefix_arm64/lib/libsodium.a" \
-output "$prefix/lib/libsodium.a"
mv -f -- "$prefix_arm64/include" "$prefix/"
# Cleanup
rm -rf -- "$prefix/tmp"

2
platform-darwin/Scripts/build_libsodium-osx
View File

@@ -2,7 +2,7 @@
set -e
cd "${BASH_SOURCE%/*}/../External/libsodium"
[[ -d libsodium-osx ]] && exit
[[ -e "${prefix=$PWD/libsodium-osx}/lib/libsodium.a" ]] && exit
# Inspired by libsodium/dist-build/osx.sh
# Prepare