From dadbaef4f85f886ceb1d676eb2832bec205b0fc7 Mon Sep 17 00:00:00 2001 From: Oleh Nikolaiev Date: Fri, 13 Dec 2024 16:38:45 +0000 Subject: [PATCH 1/4] fix release build --- .github/workflows/publish.yml | 2 +- CMakeLists.txt | 32 +++++++----- third_party/cryptlite/sha256.h | 2 + threshold_encryption/CMakeLists.txt | 77 +++++++++++++++-------------- 4 files changed, 63 insertions(+), 50 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4608d984..4e9ddc2a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -57,7 +57,7 @@ jobs: export CXX=g++-11 export TARGET=all mkdir -p build && cd build - cmake .. + cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo - name: Build run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index 04650263..a5886c7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,16 +164,16 @@ else() set( BOOST_LIBS_4_BLS boost_program_options ) endif() -set (WITH_PROCPS OFF) +set(WITH_PROCPS OFF) set(BLS_INCLUDE_DIRS - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/bls - ${DEPS_SOURCES_ROOT} - ${DEPS_INSTALL_ROOT} - ${CMAKE_CURRENT_SOURCE_DIR}/deps/include - PARENT_SCOPE - ) + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/bls + ${DEPS_SOURCES_ROOT} + ${DEPS_INSTALL_ROOT} + ${CMAKE_CURRENT_SOURCE_DIR}/deps/include + PARENT_SCOPE +) target_include_directories(bls PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(bls PRIVATE ff ${CRYPTOPP_LIBRARY} ${GMPXX_LIBRARY} ${GMP_LIBRARY}) @@ -245,7 +245,9 @@ if(BUILD_TESTS) if (EMSCRIPTEN) target_compile_options(bls_unit_test PRIVATE -s DISABLE_EXCEPTION_CATCHING=1) set_target_properties(bls_unit_test PROPERTIES LINK_FLAGS "-s DISABLE_EXCEPTION_CATCHING=1") - endif() + else() + target_compile_options(bls_unit_test PRIVATE -Wno-format-overflow) + endif() target_link_libraries(bls_unit_test PRIVATE bls ${CRYPTOPP_LIBRARY} ff ${GMPXX_LIBRARY} ${GMP_LIBRARY} ${BOOST_LIBS_4_BLS}) add_test(NAME bls_tests COMMAND bls_unit_test) @@ -255,7 +257,9 @@ if(BUILD_TESTS) if (EMSCRIPTEN) target_compile_options(dkg_unit_test PRIVATE -s DISABLE_EXCEPTION_CATCHING=1) set_target_properties(dkg_unit_test PROPERTIES LINK_FLAGS "-s DISABLE_EXCEPTION_CATCHING=1") - endif() + else() + target_compile_options(dkg_unit_test PRIVATE -Wno-format-overflow) + endif() target_link_libraries(dkg_unit_test PRIVATE bls ${CRYPTOPP_LIBRARY} ff ${GMP_LIBRARY} ${GMPXX_LIBRARY} ${BOOST_LIBS_4_BLS}) add_test(NAME dkg_tests COMMAND dkg_unit_test) @@ -265,7 +269,9 @@ if(BUILD_TESTS) if (EMSCRIPTEN) target_compile_options(bls_test PRIVATE -s DISABLE_EXCEPTION_CATCHING=1) set_target_properties(bls_test PROPERTIES LINK_FLAGS "-s DISABLE_EXCEPTION_CATCHING=1") - endif() + else() + target_compile_options(bls_test PRIVATE -Wno-format-overflow) + endif() target_link_libraries(bls_test PRIVATE bls ${CRYPTOPP_LIBRARY} ff ${GMP_LIBRARY} ${GMPXX_LIBRARY} ${BOOST_LIBS_4_BLS}) add_test(NAME bls_test COMMAND bls_test) @@ -281,7 +287,9 @@ if(BUILD_TESTS) if (EMSCRIPTEN) target_compile_options(utils_unit_test PRIVATE -s DISABLE_EXCEPTION_CATCHING=1) set_target_properties(utils_unit_test PROPERTIES LINK_FLAGS "-s DISABLE_EXCEPTION_CATCHING=1") - endif() + else() + target_compile_options(utils_unit_test PRIVATE -Wno-format-overflow) + endif() target_link_libraries(utils_unit_test PRIVATE bls te ${CRYPTOPP_LIBRARY} ff ${GMPXX_LIBRARY} ${GMP_LIBRARY} ${BOOST_LIBS_4_BLS}) add_test(NAME utils_tests COMMAND utils_unit_test) diff --git a/third_party/cryptlite/sha256.h b/third_party/cryptlite/sha256.h index 8298a52c..b1260684 100644 --- a/third_party/cryptlite/sha256.h +++ b/third_party/cryptlite/sha256.h @@ -22,6 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" + #ifndef _CRYPTLITE_SHA256_H_ #define _CRYPTLITE_SHA256_H_ #include diff --git a/threshold_encryption/CMakeLists.txt b/threshold_encryption/CMakeLists.txt index 180eb340..653510ff 100644 --- a/threshold_encryption/CMakeLists.txt +++ b/threshold_encryption/CMakeLists.txt @@ -5,39 +5,39 @@ project(libTE) option(BUILD_TESTS "Build tests" ON) if(BUILD_TESTS) - enable_testing() + enable_testing() endif() set(sources - threshold_encryption.cpp - TEDecryptSet.cpp - TEPrivateKeyShare.cpp - TEPrivateKey.cpp - TEPublicKey.cpp - TEPublicKeyShare.cpp - ${DKG_DIR}/dkg.cpp - ${DKG_DIR}/DKGTEWrapper.cpp - ${DKG_DIR}/DKGTESecret.cpp - ${TOOLS_DIR}/utils.cpp + threshold_encryption.cpp + TEDecryptSet.cpp + TEPrivateKeyShare.cpp + TEPrivateKey.cpp + TEPublicKey.cpp + TEPublicKeyShare.cpp + ${DKG_DIR}/dkg.cpp + ${DKG_DIR}/DKGTEWrapper.cpp + ${DKG_DIR}/DKGTESecret.cpp + ${TOOLS_DIR}/utils.cpp ) set(headers - threshold_encryption.h - TEDecryptSet.h - TEPrivateKeyShare.h - TEPrivateKey.h - TEPublicKey.h - TEPublicKeyShare.h - ${DKG_DIR}/dkg.h - ${DKG_DIR}/DKGTEWrapper.h - ${DKG_DIR}/DKGTESecret.h - ${TOOLS_DIR}/utils.h + threshold_encryption.h + TEDecryptSet.h + TEPrivateKeyShare.h + TEPrivateKey.h + TEPublicKey.h + TEPublicKeyShare.h + ${DKG_DIR}/dkg.h + ${DKG_DIR}/DKGTEWrapper.h + ${DKG_DIR}/DKGTESecret.h + ${TOOLS_DIR}/utils.h ) set(PROJECT_VERSION 0.2.0) -set (THIRD_PARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../) -set (TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../) +set(THIRD_PARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../) +set(TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../) add_library(te ${sources} ${headers}) @@ -58,37 +58,40 @@ if (EMSCRIPTEN) endif() if (BUILD_TESTS) - add_executable(te_unit_test ../test/unit_tests_te.cpp) - target_include_directories(te_unit_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${THIRD_PARTY_DIR}) + add_executable(te_unit_test ../test/unit_tests_te.cpp) + target_include_directories(te_unit_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${THIRD_PARTY_DIR}) if (EMSCRIPTEN) - target_compile_options(te_unit_test PRIVATE -s DISABLE_EXCEPTION_CATCHING=1) - set_target_properties(te_unit_test PROPERTIES LINK_FLAGS "-s DISABLE_EXCEPTION_CATCHING=1") - endif() + target_compile_options(te_unit_test PRIVATE -s DISABLE_EXCEPTION_CATCHING=1) + set_target_properties(te_unit_test PROPERTIES LINK_FLAGS "-s DISABLE_EXCEPTION_CATCHING=1") + else() + target_compile_options(te_unit_test PRIVATE -Wno-format-overflow) + endif() target_link_libraries(te_unit_test PRIVATE te ${CRYPTOPP_LIBRARY} ff ${GMPXX_LIBRARY} ${GMP_LIBRARY}) - add_test(NAME te_tests COMMAND te_unit_test) + add_test(NAME te_tests COMMAND te_unit_test) add_executable(te_test ../test/test_TE_wrappers.cpp) target_include_directories(te_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${THIRD_PARTY_DIR}) if (EMSCRIPTEN) - target_compile_options(te_test PRIVATE -s DISABLE_EXCEPTION_CATCHING=1) - set_target_properties(te_test PROPERTIES LINK_FLAGS "-s DISABLE_EXCEPTION_CATCHING=1") - endif() + target_compile_options(te_test PRIVATE -s DISABLE_EXCEPTION_CATCHING=1) + set_target_properties(te_test PROPERTIES LINK_FLAGS "-s DISABLE_EXCEPTION_CATCHING=1") + else() + target_compile_options(te_test PRIVATE -Wno-format-overflow) + endif() target_link_libraries(te_test PRIVATE te ${CRYPTOPP_LIBRARY} ff ${GMPXX_LIBRARY} ${GMP_LIBRARY}) if (EMSCRIPTEN) add_executable(encrypt_message ../test/encryptMessageJS.cpp) target_include_directories(encrypt_message PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${THIRD_PARTY_DIR}) - target_compile_options(encrypt_message PRIVATE -s DISABLE_EXCEPTION_CATCHING=1) - set_target_properties(encrypt_message PROPERTIES LINK_FLAGS "-s EXIT_RUNTIME=1 -s USE_PTHREADS=0 -s EXPORTED_FUNCTIONS=['_main'] -s MAIN_MODULE=1 --bind") + target_compile_options(encrypt_message PRIVATE -s DISABLE_EXCEPTION_CATCHING=1) + set_target_properties(encrypt_message PROPERTIES LINK_FLAGS "-s EXIT_RUNTIME=1 -s USE_PTHREADS=0 -s EXPORTED_FUNCTIONS=['_main'] -s MAIN_MODULE=1 --bind") target_link_libraries(encrypt_message PRIVATE te ${CRYPTOPP_LIBRARY} ff ${GMPXX_LIBRARY} ${GMP_LIBRARY}) endif() if(NOT EMSCRIPTEN AND NOT APPLE) add_executable(te_sample_sgx ../test/te_sample_sgx.cpp) - target_include_directories(te_sample_sgx PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${THIRD_PARTY_DIR}) - target_link_libraries(te_sample_sgx PRIVATE te bls ${CRYPTOPP_LIBRARY} ff ${GMPXX_LIBRARY} ${GMP_LIBRARY} - jsonrpccpp-client jsonrpccpp-server jsonrpccpp-common jsoncpp curl pthread ssl crypto z idn2) + target_include_directories(te_sample_sgx PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${THIRD_PARTY_DIR}) + target_link_libraries(te_sample_sgx PRIVATE te bls ${CRYPTOPP_LIBRARY} ff ${GMPXX_LIBRARY} ${GMP_LIBRARY} jsonrpccpp-client jsonrpccpp-server jsonrpccpp-common jsoncpp curl pthread ssl crypto z idn2) endif() add_test(NAME te_wrap_tests COMMAND te_unit_test) From 22b0ebf731fe81e3abbbbc566b987d6a23f1cc96 Mon Sep 17 00:00:00 2001 From: Oleh Nikolaiev Date: Fri, 13 Dec 2024 17:12:39 +0000 Subject: [PATCH 2/4] update macos job --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e377ddc6..eade72d7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -176,7 +176,7 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} files: ./coverage.info osx_build_and_test: - runs-on: macos-12 + runs-on: macos-13 steps: - name: Extract repo name run: echo ::set-env name=REPOSITORY_NAME::$(echo "$GITHUB_REPOSITORY" | awk -F / From c598594a31260e7a9a2a3a73e95aa909504b7fb2 Mon Sep 17 00:00:00 2001 From: Oleh Nikolaiev Date: Fri, 13 Dec 2024 18:24:14 +0000 Subject: [PATCH 3/4] remove osx support --- .github/workflows/test.yml | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index eade72d7..3fca1cd4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -175,42 +175,6 @@ jobs: with: token: ${{ secrets.CODECOV_TOKEN }} files: ./coverage.info - osx_build_and_test: - runs-on: macos-13 - steps: - - name: Extract repo name - run: echo ::set-env name=REPOSITORY_NAME::$(echo "$GITHUB_REPOSITORY" | awk -F / - '{print $2}') - shell: bash - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: true - - name: Checkout - uses: actions/checkout@v2 - - name: Install packages - run: | - brew install yasm texinfo shtool libtool coreutils - - name: Build dependencies - run: | - cd deps - ./build.sh - - name: Configure all - run: | - mkdir -p build && cd build - cmake .. - - name: Build all - run: | - cd build - make -j$(sysctl -n hw.ncpu) - - name: Run tests - run: | - cp scripts/parameters.json build/ - cd build - ./bls_unit_test - ./dkg_unit_test - ./bls_test - ./threshold_encryption/te_unit_test - ./threshold_encryption/te_test - ./dkg_attack linux_build_with_emscripten: runs-on: ubuntu-22.04 strategy: From 932308e9be3519c1057fdce27ead61ef2b63a2ce Mon Sep 17 00:00:00 2001 From: Oleh Date: Sun, 15 Dec 2024 15:11:29 +0000 Subject: [PATCH 4/4] re-enable macos support --- .github/workflows/test.yml | 36 ++++++++++++++++++++ CMakeLists.txt | 68 +++++++++++++++++++------------------- bls/bls.cpp | 8 +++++ deps/build.sh | 36 +++++++++++++------- deps/clean.sh | 11 ++---- 5 files changed, 104 insertions(+), 55 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3fca1cd4..eade72d7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -175,6 +175,42 @@ jobs: with: token: ${{ secrets.CODECOV_TOKEN }} files: ./coverage.info + osx_build_and_test: + runs-on: macos-13 + steps: + - name: Extract repo name + run: echo ::set-env name=REPOSITORY_NAME::$(echo "$GITHUB_REPOSITORY" | awk -F / + '{print $2}') + shell: bash + env: + ACTIONS_ALLOW_UNSECURE_COMMANDS: true + - name: Checkout + uses: actions/checkout@v2 + - name: Install packages + run: | + brew install yasm texinfo shtool libtool coreutils + - name: Build dependencies + run: | + cd deps + ./build.sh + - name: Configure all + run: | + mkdir -p build && cd build + cmake .. + - name: Build all + run: | + cd build + make -j$(sysctl -n hw.ncpu) + - name: Run tests + run: | + cp scripts/parameters.json build/ + cd build + ./bls_unit_test + ./dkg_unit_test + ./bls_test + ./threshold_encryption/te_unit_test + ./threshold_encryption/te_test + ./dkg_attack linux_build_with_emscripten: runs-on: ubuntu-22.04 strategy: diff --git a/CMakeLists.txt b/CMakeLists.txt index a5886c7f..88ad90a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,48 +91,48 @@ endif() set( CLANG_FORMAT_EXCLUDE_PATTERNS ${CMAKE_BINARY_DIR} ${DEPS_SOURCES_ROOT} - ) +) include( BlsFindClangFormat ) set( TOOLS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tools/") set( DKG_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dkg/") set(sourses_bls - bls/bls.cpp - bls/BLSPrivateKeyShare.cpp - bls/BLSPrivateKey.cpp - bls/BLSPublicKeyShare.cpp - bls/BLSPublicKey.cpp - bls/BLSSignature.cpp - bls/BLSSigShare.cpp - bls/BLSSigShareSet.cpp - dkg/dkg.cpp - dkg/DKGBLSWrapper.cpp - dkg/DKGBLSSecret.cpp - third_party/cryptlite/base64.cpp - tools/utils.cpp - ) + bls/bls.cpp + bls/BLSPrivateKeyShare.cpp + bls/BLSPrivateKey.cpp + bls/BLSPublicKeyShare.cpp + bls/BLSPublicKey.cpp + bls/BLSSignature.cpp + bls/BLSSigShare.cpp + bls/BLSSigShareSet.cpp + dkg/dkg.cpp + dkg/DKGBLSWrapper.cpp + dkg/DKGBLSSecret.cpp + third_party/cryptlite/base64.cpp + tools/utils.cpp +) set(headers_bls - libBLS.h - bls/bls.h - bls/BLSPrivateKeyShare.h - bls/BLSPrivateKey.h - bls/BLSPublicKeyShare.h - bls/BLSPublicKey.h - bls/BLSSignature.h - bls/BLSSigShare.h - bls/BLSSigShareSet.h - dkg/dkg.h - dkg/DKGBLSWrapper.h - dkg/DKGBLSSecret.h - third_party/json.hpp - third_party/cryptlite/sha256.h - third_party/cryptlite/sha1.h - third_party/cryptlite/hmac.h - third_party/cryptlite/base64.h - tools/utils.h - ) + libBLS.h + bls/bls.h + bls/BLSPrivateKeyShare.h + bls/BLSPrivateKey.h + bls/BLSPublicKeyShare.h + bls/BLSPublicKey.h + bls/BLSSignature.h + bls/BLSSigShare.h + bls/BLSSigShareSet.h + dkg/dkg.h + dkg/DKGBLSWrapper.h + dkg/DKGBLSSecret.h + third_party/json.hpp + third_party/cryptlite/sha256.h + third_party/cryptlite/sha1.h + third_party/cryptlite/hmac.h + third_party/cryptlite/base64.h + tools/utils.h +) set(PROJECT_VERSION 0.2.0) add_definitions(-DBLS_VERSION=${PROJECT_VERSION}) diff --git a/bls/bls.cpp b/bls/bls.cpp index 53eb41da..dc079df9 100644 --- a/bls/bls.cpp +++ b/bls/bls.cpp @@ -343,6 +343,10 @@ std::pair< libff::alt_bn128_Fr, libff::alt_bn128_G2 > Bls::KeysRecover( throw ThresholdUtils::IncorrectInput( "not enough participants in the threshold group" ); } + if ( shares.size() > this->n_ || coeffs.size() > this->n_ ) { + throw ThresholdUtils::IncorrectInput( "too many participants in the threshold group" ); + } + libff::alt_bn128_Fr secret_key = libff::alt_bn128_Fr::zero(); for ( size_t i = 0; i < this->t_; ++i ) { @@ -365,6 +369,10 @@ libff::alt_bn128_G1 Bls::SignatureRecover( const std::vector< libff::alt_bn128_G throw ThresholdUtils::IncorrectInput( "not enough participants in the threshold group" ); } + if ( shares.size() > this->n_ || coeffs.size() > this->n_ ) { + throw ThresholdUtils::IncorrectInput( "too many participants in the threshold group" ); + } + libff::alt_bn128_G1 sign = libff::alt_bn128_G1::zero(); for ( size_t i = 0; i < this->t_; ++i ) { diff --git a/deps/build.sh b/deps/build.sh index 040a3462..cf4fa058 100755 --- a/deps/build.sh +++ b/deps/build.sh @@ -565,17 +565,24 @@ then then env_restore cd "$SOURCES_ROOT" - if [ ! -d "boost_1_68_0" ]; + BOOST_NAME="boost_1_68_0" + BOOST_VERSION="1.68.0" + if [ "$UNIX_SYSTEM_NAME" = "Darwin" ]; + then + BOOST_NAME="boost_1_82_0" + BOOST_VERSION="1.82.0" + fi + if [ ! -d "${BOOST_NAME}" ]; then - if [ ! -f "boost_1_68_0.tar.bz2" ]; + if [ ! -f "${BOOST_NAME}.tar.bz2" ]; then eval echo -e "${COLOR_INFO}downloading it${COLOR_DOTS}...${COLOR_RESET}" - eval "$WGET" https://sourceforge.net/projects/boost/files/boost/1.68.0/boost_1_68_0.tar.bz2 + eval "$WGET" https://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/${BOOST_NAME}.tar.bz2 fi echo -e "${COLOR_INFO}unpacking it${COLOR_DOTS}...${COLOR_RESET}" - tar -xf boost_1_68_0.tar.bz2 + tar -xf ${BOOST_NAME}.tar.bz2 fi - cd boost_1_68_0 + cd ${BOOST_NAME} echo -e "${COLOR_INFO}configuring and building it${COLOR_DOTS}...${COLOR_RESET}" if [[ "${WITH_EMSCRIPTEN}" -eq 1 ]]; then @@ -592,7 +599,7 @@ then else if [ "$UNIX_SYSTEM_NAME" = "Darwin" ]; then - eval ./b2 cxxflags=-fPIC toolset=clang cxxstd=14 cflags=-fPIC "${PARALLEL_MAKE_OPTIONS}" --prefix="$INSTALL_ROOT" --layout=system variant=debug link=static threading=multi install + eval ./b2 cxxflags=-fPIC toolset=clang cxxstd=17 cflags=-fPIC "${PARALLEL_MAKE_OPTIONS}" --prefix="$INSTALL_ROOT" --layout=system variant=debug link=static threading=multi install else if [[ "${WITH_EMSCRIPTEN}" -eq 1 ]]; then @@ -681,21 +688,26 @@ then # requiired for libff env_restore cd "$SOURCES_ROOT" - if [ ! -d "gmp-6.1.2" ]; + GMP_NAME="gmp-6.1.2" + if [ "$UNIX_SYSTEM_NAME" = "Darwin" ]; + then + GMP_NAME="gmp-6.3.0" + fi + if [ ! -d "${GMP_NAME}" ]; then - if [ ! -f "gmp-6.1.2.tar.xz" ]; + if [ ! -f ""${GMP_NAME}".tar.xz" ]; then echo -e "${COLOR_INFO}getting it from gmp website${COLOR_DOTS}...${COLOR_RESET}" - eval "$WGET" https://ftp.gnu.org/gnu/gmp/gmp-6.1.2.tar.xz + eval "$WGET" https://ftp.gnu.org/gnu/gmp/"${GMP_NAME}".tar.xz fi echo -e "${COLOR_INFO}unpacking it${COLOR_DOTS}...${COLOR_RESET}" - eval tar -xf gmp-6.1.2.tar.xz + eval tar -xf "${GMP_NAME}".tar.xz fi - cd gmp-6.1.2 + cd "${GMP_NAME}" echo -e "${COLOR_INFO}configuring it${COLOR_DOTS}...${COLOR_RESET}" if [ "$UNIX_SYSTEM_NAME" = "Darwin" ]; then - eval ./configure "${CONF_CROSSCOMPILING_OPTS_GENERIC}" "${CONF_DEBUG_OPTIONS}" --enable-cxx --enable-static --disable-shared --build=x86_64-apple-darwin#{OS.kernel_version.major} --prefix="$INSTALL_ROOT" + eval ./configure "${CONF_CROSSCOMPILING_OPTS_GENERIC}" "${CONF_DEBUG_OPTIONS}" --enable-cxx --enable-static --disable-shared --disable-assembly --build=x86_64-apple-darwin#{OS.kernel_version.major} --prefix="$INSTALL_ROOT" else if [[ "${WITH_EMSCRIPTEN}" -eq 1 ]]; then diff --git a/deps/clean.sh b/deps/clean.sh index f8cb6fa4..c2c45a1a 100755 --- a/deps/clean.sh +++ b/deps/clean.sh @@ -114,24 +114,17 @@ rm -f ./*.tar.bz2 rm -f ./*.zip echo "Cleaning upacked library folders..." rm -rf ./libiconv-1.15 -rm -rf ./zlib rm -rf ./openssl rm -rf ./curl rm -rf ./libuv rm -rf ./libwebsockets -rm -rf ./boost_1_68_0 -rm -rf ./argtable2 -rm -rf ./nettle-2.0 -rm -rf ./nettle-3.4.1 -rm -rf ./gnutls-3.6.5 +rm -rf ./boost* rm -rf ./libmicrohttpd rm -rf ./jsoncpp -rm -rf ./libjson-rpc-cpp rm -rf ./libcryptopp -rm -rf ./gmp-6.1.2 +rm -rf ./gmp-6* rm -rf ./libff rm -rf ./emsdk -rm -rf ./jsoncpp rm -rf ./libjson-rpc-cpp* rm -rf ./zlib rm -rf ./argtable2