Skip to content

Commit 75a75eb

Browse files
authored
use zero-autotools approach when compiling libsodium on mac (#1725)
* Update build-macos-portable.sh update macro names * Update build-macos-portable.sh Make config.sub executable * Update build-macos-portable.sh Let's use zero-autotools approach when compiling libsodium on mac * Update build-macos-portable.sh refactor libsodium directory
1 parent 283186b commit 75a75eb

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

assembly/native/build-macos-portable.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,19 @@ else
6565
echo "Using compiled lz4"
6666
fi
6767

68-
if [ ! -d "../3pp/libsodium" ]; then
68+
if [ ! -d "../3pp/libsodium-1.0.18" ]; then
6969
export LIBSODIUM_FULL_BUILD=1
70-
git clone https://github.com/jedisct1/libsodium.git ../3pp/libsodium
71-
cd ../3pp/libsodium
70+
cd ../3pp
71+
curl -LO https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz
72+
tar -xzf libsodium-1.0.18.tar.gz
73+
cd libsodium-1.0.18
7274
sodiumPath=`pwd`
73-
git checkout 1.0.18
74-
./autogen.sh
7575
./configure --with-pic --enable-static
7676
make -j4
7777
test $? -eq 0 || { echo "Can't compile libsodium"; exit 1; }
7878
cd ../../build
7979
else
80-
sodiumPath=$(pwd)/../3pp/libsodium
80+
sodiumPath=$(pwd)/../3pp/libsodium-1.0.18
8181
echo "Using compiled libsodium"
8282
fi
8383

0 commit comments

Comments
 (0)