From ad1979c11e6a7d9a30fff460e5503426bf663b3c Mon Sep 17 00:00:00 2001 From: Fabrice Drouin Date: Fri, 19 Mar 2021 19:07:05 +0100 Subject: [PATCH] Update libsecp256k1 code (#16) There are no external dependencies now --- jni/jvm/build.sh | 2 -- native/build.sh | 1 - native/secp256k1 | 2 +- src/nativeInterop/cinterop/libsecp256k1.def | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/jni/jvm/build.sh b/jni/jvm/build.sh index c31b6bb..3ca84eb 100755 --- a/jni/jvm/build.sh +++ b/jni/jvm/build.sh @@ -14,11 +14,9 @@ JNI_HEADERS=$TARGET if [ "$TARGET" == "linux" ]; then OUTFILE=libsecp256k1-jni.so - ADD_LIB=-lgmp CC_OPTS="-fPIC" elif [ "$TARGET" == "darwin" ]; then OUTFILE=libsecp256k1-jni.dylib - ADD_LIB=-lgmp elif [ "$TARGET" == "mingw" ]; then OUTFILE=secp256k1-jni.dll CC=x86_64-w64-mingw32-gcc diff --git a/native/build.sh b/native/build.sh index b1bb46e..ccf75b1 100755 --- a/native/build.sh +++ b/native/build.sh @@ -15,7 +15,6 @@ if [ "$TARGET" == "mingw" ]; then CONF_OPTS="CFLAGS=-fPIC --host=x86_64-w64-mingw32" elif [ "$TARGET" == "linux" ]; then CONF_OPTS="CFLAGS=-fPIC" - [ "$CROSS" == "1" ] && sudo apt -y install libgmp-dev elif [ "$TARGET" == "darwin" ]; then CONF_OPTS="--host=x86_64-w64-darwin" else diff --git a/native/secp256k1 b/native/secp256k1 index dbd41db..26de4df 160000 --- a/native/secp256k1 +++ b/native/secp256k1 @@ -1 +1 @@ -Subproject commit dbd41db16a0e91b2566820898a3ab2d7dad4fe00 +Subproject commit 26de4dfeb1f1436dae1fcf17f57bdaa43540f940 diff --git a/src/nativeInterop/cinterop/libsecp256k1.def b/src/nativeInterop/cinterop/libsecp256k1.def index c0251c3..3d666d2 100644 --- a/src/nativeInterop/cinterop/libsecp256k1.def +++ b/src/nativeInterop/cinterop/libsecp256k1.def @@ -4,7 +4,7 @@ headers = secp256k1.h secp256k1_ecdh.h secp256k1_recovery.h headerFilter = secp256k1/** secp256k1_ecdh.h secp256k1_recovery.h secp256k1.h libraryPaths.linux = c/secp256k1/build/linux/ -linkerOpts.linux = -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu -L/usr/local/lib -lgmp +linkerOpts.linux = -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu -L/usr/local/lib libraryPaths.ios = c/secp256k1/build/ios/ /usr/local/lib linkerOpts.ios = -framework Security -framework Foundation