From 761b4649c8d8d2f1061ba3b1aaa91b7e08da538b Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Sat, 15 Jan 2022 23:53:50 +0100 Subject: [PATCH] Don't use konan cross compiling as it's not bundled anymore --- sodiumWrapper/configureLinux64.sh | 99 +++++++++++++++------------- sodiumWrapper/configureLinuxArm64.sh | 24 ++++--- sodiumWrapper/libsodium | 2 +- 3 files changed, 70 insertions(+), 55 deletions(-) diff --git a/sodiumWrapper/configureLinux64.sh b/sodiumWrapper/configureLinux64.sh index f334199..b718ea1 100755 --- a/sodiumWrapper/configureLinux64.sh +++ b/sodiumWrapper/configureLinux64.sh @@ -1,50 +1,57 @@ #!/bin/bash -## and then borrowed and slightly modified from https://github.com/datkt/sodium/configure -## borrowed from https://github.com/sodium-friends/sodium-native/blob/master/configure -PREFIX="${PREFIX:-$PWD/static-linux-x86-64}" -KONAN="${KONAN:-$HOME/.konan}" -ARCH=${ARCH:-$(uname -m)} -echo $PREFIX -echo $KONAN -echo $ARCH +### and then borrowed and slightly modified from https://github.com/datkt/sodium/configure +### borrowed from https://github.com/sodium-friends/sodium-native/blob/master/configure +#PREFIX="${PREFIX:-$PWD/static-linux-x86-64}" +#KONAN="${KONAN:-$HOME/.konan}" +#ARCH=${ARCH:-$(uname -m)} +#echo $PREFIX +#echo $KONAN +#echo $ARCH +#cd libsodium +# +#./autogen.sh -s -f +# +#if [ -z "$SYSROOT" ]; then +# case $(uname -a) in +# **Linux*x86_64**) +# echo "Linux env" +# GCC=${GCC:-gcc} +# GCC=gcc +# export CC=$(find $KONAN/dependencies -wholename *${ARCH/_/-}/bin/*$GCC | head -n1) +# ;; +# +# **Linux*aarch64**) +# echo "Linux ARM env" +# GCC=${GCC:-gcc} +# GCC=gcc +# export CC=$(find $KONAN/dependencies -wholename *${ARCH/_/-}/bin/*$GCC | head -n1) +# ;; +# +# +# **Darwin*x86_64**) +# echo "Darwin env" +# GCC=${GCC:-clang} +# export CC=$(find $KONAN/dependencies -wholename *${ARCH/_/-}/bin/*$GCC | head -n1) +# ;; +# +# **MSYS*x86_64**) +# echo "Msys env" +# GCC=clang.exe +# export CC=$(find $KONAN/dependencies -wholename *${ARCH}*/bin/*$GCC | head -n1) +# ;; +# +# esac +# +# +# echo "CC" +# echo $CC +#fi +# +#./configure --prefix=$PREFIX "$@" + +#! /bin/sh +export PREFIX="$(pwd)/static-linux-x86-64" +export CC=gcc cd libsodium - ./autogen.sh -s -f - -if [ -z "$SYSROOT" ]; then - case $(uname -a) in - **Linux*x86_64**) - echo "Linux env" - GCC=${GCC:-gcc} - GCC=gcc - export CC=$(find $KONAN/dependencies -wholename *${ARCH/_/-}/bin/*$GCC | head -n1) - ;; - - **Linux*aarch64**) - echo "Linux ARM env" - GCC=${GCC:-gcc} - GCC=gcc - export CC=$(find $KONAN/dependencies -wholename *${ARCH/_/-}/bin/*$GCC | head -n1) - ;; - - - **Darwin*x86_64**) - echo "Darwin env" - GCC=${GCC:-clang} - export CC=$(find $KONAN/dependencies -wholename *${ARCH/_/-}/bin/*$GCC | head -n1) - ;; - - **MSYS*x86_64**) - echo "Msys env" - GCC=clang.exe - export CC=$(find $KONAN/dependencies -wholename *${ARCH}*/bin/*$GCC | head -n1) - ;; - - esac - - - echo "CC" - echo $CC -fi - ./configure --prefix=$PREFIX "$@" diff --git a/sodiumWrapper/configureLinuxArm64.sh b/sodiumWrapper/configureLinuxArm64.sh index 7cf24f3..63a06cb 100755 --- a/sodiumWrapper/configureLinuxArm64.sh +++ b/sodiumWrapper/configureLinuxArm64.sh @@ -1,13 +1,21 @@ +##! /bin/sh +#export PREFIX="$(pwd)/static-arm64" +#export CLANG_BIN=$HOME/.konan/dependencies/clang-llvm-8.0.0-linux-x86-64/bin +#export CC=$HOME/.konan/dependencies/clang-llvm-8.0.0-linux-x86-64/bin/clang +#export SYSROOT=$HOME/.konan/dependencies/target-sysroot-1-linux-glibc-arm64 +#export TOOLCHAIN=$HOME/.konan/dependencies/target-gcc-toolchain-3-linux-x86-64/x86_64-unknown-linux-gnu +##export CFLAGS="-O3 -target aarch64-unknown-linux-gnu --sysroot $SYSROOT -gcc-toolchain $TOOLCHAIN -fuse-ld=$CLANG_BIN/ld.lld -B$CLANG_BIN" +#export CFLAGS="-O3 -target aarch64-unknown-linux-gnu --sysroot $SYSROOT -fuse-ld=$CLANG_BIN/ld.lld" +#export LDFLAGS="-fuse-ld=$CLANG_BIN/ld.lld" +#cd libsodium +#./autogen.sh -s -f +#./configure --prefix=$PREFIX --with-sysroot=$SYSROOT --host=aarch64-unknown-linux-gnu "$@" + #! /bin/sh export PREFIX="$(pwd)/static-arm64" -export CLANG_BIN=$HOME/.konan/dependencies/clang-llvm-8.0.0-linux-x86-64/bin -export CC=$HOME/.konan/dependencies/clang-llvm-8.0.0-linux-x86-64/bin/clang -export SYSROOT=$HOME/.konan/dependencies/target-sysroot-1-linux-glibc-arm64 -export TOOLCHAIN=$HOME/.konan/dependencies/target-gcc-toolchain-3-linux-x86-64/x86_64-unknown-linux-gnu -#export CFLAGS="-O3 -target aarch64-unknown-linux-gnu --sysroot $SYSROOT -gcc-toolchain $TOOLCHAIN -fuse-ld=$CLANG_BIN/ld.lld -B$CLANG_BIN" -export CFLAGS="-O3 -target aarch64-unknown-linux-gnu --sysroot $SYSROOT -fuse-ld=$CLANG_BIN/ld.lld" -export LDFLAGS="-fuse-ld=$CLANG_BIN/ld.lld" +export CC=aarch64-linux-gnu-gcc cd libsodium ./autogen.sh -s -f -./configure --prefix=$PREFIX --with-sysroot=$SYSROOT --host=aarch64-unknown-linux-gnu "$@" +./configure --prefix=$PREFIX --host=aarch64-unknown-linux-gnu "$@" + diff --git a/sodiumWrapper/libsodium b/sodiumWrapper/libsodium index a016aea..7d67f19 160000 --- a/sodiumWrapper/libsodium +++ b/sodiumWrapper/libsodium @@ -1 +1 @@ -Subproject commit a016aea61214668827e18c6278ac25b0bbc98ca5 +Subproject commit 7d67f1909bfa6e1225469dbcdb0229c5a9bbf8e2