From f37df50836f227c64520ba30e2d48a51136adcd2 Mon Sep 17 00:00:00 2001 From: Sergey Sherkunov Date: Fri, 29 Jun 2018 12:19:54 +0300 Subject: [PATCH 1/2] Use fork secp256k1-zkp #14 --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 22610c43d..7bf0a5d69 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "vendor/secp256k1-zkp"] path = vendor/secp256k1-zkp - url = https://github.com/cryptonomex/secp256k1-zkp.git + url = https://github.com/GolosChain/secp256k1-zkp.git [submodule "vendor/websocketpp"] path = vendor/websocketpp url = https://github.com/zaphoyd/websocketpp.git From 0579c8680b2bd35a7513105d639fcf26c1f736f8 Mon Sep 17 00:00:00 2001 From: Sergey Sherkunov Date: Fri, 29 Jun 2018 14:58:27 +0300 Subject: [PATCH 2/2] Fixed building in Docker #14 --- CMakeLists.txt | 5 ----- vendor/secp256k1-zkp | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d310d272..ed5957a1b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,11 +86,6 @@ else(MSVC) BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/vendor/secp256k1-zkp/src/project_secp256k1-build/.libs/libsecp256k1.a ) endif(MINGW) - externalproject_add_step(project_secp256k1 autogen - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp/autogen.sh - DEPENDERS configure - ) externalproject_get_property(project_secp256k1 binary_dir) diff --git a/vendor/secp256k1-zkp b/vendor/secp256k1-zkp index bd067945e..db0786892 160000 --- a/vendor/secp256k1-zkp +++ b/vendor/secp256k1-zkp @@ -1 +1 @@ -Subproject commit bd067945ead3b514fba884abd0de95fc4b5db9ae +Subproject commit db078689297f1e45fbbc2c6aa8fe54b6c0c726d8