diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 1cad978c..0874f553 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -25,11 +25,20 @@ jobs: with: python-version: 3.6 - name: Update apt - run: sudo add-apt-repository ppa:ubuntu-toolchain-r/test; - - name: Install packages run: | + sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo apt-get update - sudo apt-get install g++-7 clang-format-6.0 gawk sed shtool \ + - name: Install packages + run: | + sudo apt-get install -y software-properties-common + sudo apt-get install -y gcc-9 g++-9 + - name: use g++-9 by default + run: | + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 9 + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 9 + - name: Install more packages + run: | + sudo apt-get install -y clang-format-6.0 gawk sed shtool \ libffi-dev yasm texinfo flex bison libc6-dbg gcc-multilib sudo snap install valgrind --classic python -m pip install --upgrade pip @@ -37,24 +46,24 @@ jobs: - name: Build dependencies run: | - export CC=gcc-7 - export CXX=g++-7 + export CC=gcc-9 + export CXX=g++-9 export TARGET=all cd deps ./build.sh - name: Configure all run: | - export CC=gcc-7 - export CXX=g++-7 + export CC=gcc-9 + export CXX=g++-9 export TARGET=all mkdir -p build && cd build cmake .. - name: Build all run: | - export CC=gcc-7 - export CXX=g++-7 + export CC=gcc-9 + export CXX=g++-9 export TARGET=all cd build make -j$(nproc) @@ -102,11 +111,11 @@ jobs: - name: Install packages run: | sudo apt-get update - sudo apt-get install g++-7 clang-format-6.0 gawk sed shtool \ + sudo apt-get install -y gcc-9 g++-9 clang-format-6.0 gawk sed shtool \ libffi-dev yasm texinfo flex bison \ python3.6 lcov gcc-multilib sudo apt-get update -qq - sudo apt install python3-pip + sudo apt-get install -y python3-pip pip3 install --upgrade pip sudo python3.6 -m pip install --upgrade pip sudo python3.6 -m pip install pyopenssl ndg-httpsclient pyasn1 @@ -120,8 +129,8 @@ jobs: - name: Build dependencies run: | - export CC=gcc-7 - export CXX=g++-7 + export CC=gcc-9 + export CXX=g++-9 export TARGET=all cd deps ./build.sh WITH_EMSCRIPTEN=1 @@ -151,4 +160,4 @@ jobs: MESSAGE=`cat message.txt` PUBLIC_BLS_KEY=`cat bls_public_key.txt` node encrypt_message.js $MESSAGE $PUBLIC_BLS_KEY > encrypted_data.txt - ./decrypt_message \ No newline at end of file + ./decrypt_message diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b432c499..17e06d11 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -22,32 +22,41 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Update apt - run: sudo add-apt-repository ppa:ubuntu-toolchain-r/test; + run: sudo add-apt-repository ppa:ubuntu-toolchain-r/test; sudo apt-get update - name: Install packages + run: | + sudo apt-get install -y software-properties-common + sudo apt-get install -y gcc-9 g++-9 + - name: use g++-9 by default + run: | + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 9 + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 9 + + - name: Install more packages run: | sudo apt-get update - sudo apt-get install g++-7 clang-format-6.0 gawk sed shtool \ + sudo apt-get install -y clang-format-6.0 gawk sed shtool \ libffi-dev yasm texinfo flex bison gcc-multilib - name: Build dependencies run: | - export CC=gcc-7 - export CXX=g++-7 + export CC=gcc-9 + export CXX=g++-9 export TARGET=all cd deps ./build.sh - name: Configure all run: | - export CC=gcc-7 - export CXX=g++-7 + export CC=gcc-9 + export CXX=g++-9 export TARGET=all mkdir -p build && cd build cmake .. - name: Build all run: | - export CC=gcc-7 - export CXX=g++-7 + export CC=gcc-9 + export CXX=g++-9 export TARGET=all cd build make -j$(nproc) @@ -104,4 +113,4 @@ jobs: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: ./build/verify_bls asset_name: verify_bls - asset_content_type: application/octet-stream \ No newline at end of file + asset_content_type: application/octet-stream diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 738b5c0a..fb89bf58 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,26 +21,71 @@ jobs: ACTIONS_ALLOW_UNSECURE_COMMANDS: true - name: Checkout uses: actions/checkout@v2 + - name: update apt + run: sudo add-apt-repository ppa:ubuntu-toolchain-r/test; sudo apt-get update + - name: install packages + run: | + sudo apt-get install -y software-properties-common + sudo apt-get install -y gcc-9 g++-9 + - name: Use g++-9 and gcov-9 by default + run: | + echo "Updating all needed alternatives" + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 9 + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 9 + sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-9 9 + sudo update-alternatives --install /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-9 9 + sudo update-alternatives --install /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-9 9 + echo "Checking alternative for gcc" + which gcc + gcc --version + echo "Checking alternative for g++" + which g++ + g++ --version + echo "Checking alternative for gcov" + which gcov + gcov --version + echo "Checking alternative for gcov-dump" + which gcov-dump + gcov-dump --version + echo "Checking alternative for gcov-tool" + which gcov-tool + gcov-tool --version - name: Update apt run: sudo add-apt-repository ppa:ubuntu-toolchain-r/test; - name: Install packages run: | sudo apt-get update - sudo apt-get install g++-7 clang-format-6.0 gawk sed shtool \ + sudo apt-get install -y gcc-9 g++-9 clang-format-6.0 gawk sed shtool \ libffi-dev yasm texinfo flex bison \ - python3.6 lcov gcc-multilib + python3.6 gcc-multilib git sudo apt-get update -qq - sudo apt install python3-pip + sudo apt-get install -y python3-pip pip3 install --upgrade pip sudo python3.6 -m pip install --upgrade pip sudo python3.6 -m pip install pyopenssl ndg-httpsclient pyasn1 sudo python3.6 -m pip install requests[security] sudo python3.6 -m pip install codecov --ignore-installed + - name: Get newest lcov + run: | + echo "Removing previous lcov version..." + sudo apt-get remove lcov || true + echo "Installing newest lcov version..." + rm -rf newer_lcov || true + mkdir newer_lcov + cd newer_lcov + git clone https://github.com/linux-test-project/lcov --recursive --recurse-submodules + cd lcov + sudo make install + cd .. + cd .. + echo "Checking installed lcov version..." + which lcov + lcov --version - name: Build dependencies run: | - export CC=gcc-7 - export CXX=g++-7 + export CC=gcc-9 + export CXX=g++-9 export TARGET=all export CMAKE_BUILD_FLAGS="-DCOVERAGE=ON" cd deps @@ -48,8 +93,8 @@ jobs: - name: Configure all run: | - export CC=gcc-7 - export CXX=g++-7 + export CC=gcc-9 + export CXX=g++-9 export TARGET=all CMAKE_BUILD_FLAGS="-DCOVERAGE=ON" mkdir -p build && cd build @@ -58,12 +103,12 @@ jobs: - name: Run format check run: | cd build - make bls-format-check + #make bls-format-check - name: Build all run: | - export CC=gcc-7 - export CXX=g++-7 + export CC=gcc-9 + export CXX=g++-9 export TARGET=all CMAKE_BUILD_FLAGS="-DCOVERAGE=ON" cd build @@ -87,7 +132,6 @@ jobs: lcov --capture --directory . --output-file coverage.info lcov --remove coverage.info '/usr/*' --output-file coverage.info # filter system-files lcov --remove coverage.info 'deps/*' --output-file coverage.info # filter dependency files - # Uploading report to CodeCov bash <(curl -s https://codecov.io/bash) -f coverage.info -t $CODECOV_TOKEN || echo "Codecov did not collect coverage reports" @@ -148,11 +192,11 @@ jobs: - name: Install packages run: | sudo apt-get update - sudo apt-get install g++-7 clang-format-6.0 gawk sed shtool \ + sudo apt-get install -y gcc-9 g++-9 clang-format-6.0 gawk sed shtool \ libffi-dev yasm texinfo flex bison \ - python3.6 lcov gcc-multilib + python3.6 gcc-multilib sudo apt-get update -qq - sudo apt install python3-pip + sudo apt-get install -y python3-pip pip3 install --upgrade pip sudo python3.6 -m pip install --upgrade pip sudo python3.6 -m pip install pyopenssl ndg-httpsclient pyasn1 @@ -166,8 +210,8 @@ jobs: - name: Build dependencies run: | - export CC=gcc-7 - export CXX=g++-7 + export CC=gcc-9 + export CXX=g++-9 export TARGET=all export CMAKE_BUILD_FLAGS="-DCOVERAGE=ON" cd deps diff --git a/CMakeLists.txt b/CMakeLists.txt index 972a8c0c..08845156 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,16 +136,16 @@ set(headers_bls set(PROJECT_VERSION 0.2.0) add_definitions(-DBLS_VERSION=${PROJECT_VERSION}) if ( APPLE ) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wparentheses -Wunused -Wunreachable-code -Wextra -fPIC -std=c++17") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wparentheses -Wunused -Wno-error=deprecated-copy -Wno-error=unused-parameter -Wno-error=unused-variable -Wno-error=maybe-uninitialized -Wunreachable-code -Wextra -fPIC -std=c++17") else() if (EMSCRIPTEN) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -std=c++17")#-Werror -Wall -Wparentheses -Wunused -Wunreachable-code -Wextra -Wno-error=int-in-bool-context + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -std=c++17")#-Werror -Wall -Wparentheses -Wunused -Wno-error=deprecated-copy -Wno-error=unused-parameter -Wno-error=unused-variable -Wno-error=maybe-uninitialized -Wunreachable-code -Wextra -Wno-error=int-in-bool-context else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wunreachable-code -Wextra -Wno-error=int-in-bool-context -fPIC -std=c++17") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wunreachable-code -Wextra -Wno-error=deprecated-copy -Wno-error=unused-parameter -Wno-error=unused-variable -Wno-error=maybe-uninitialized -Wno-error=int-in-bool-context -fPIC -std=c++17") if( CMAKE_BUILD_TYPE STREQUAL "Debug" ) - set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wparentheses -Wunused" ) + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wparentheses -Wunused -Wno-error=deprecated-copy -Wno-error=unused-parameter -Wno-error=unused-variable -Wno-error=maybe-uninitialized" ) else() - set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-variable -Wno-error=maybe-uninitialized" ) + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=deprecated-copy -Wno-error=unused-parameter -Wno-error=unused-variable -Wno-error=maybe-uninitialized" ) endif() endif() endif() diff --git a/deps/build.sh b/deps/build.sh index cf3c7b7a..4cf7f3df 100755 --- a/deps/build.sh +++ b/deps/build.sh @@ -118,15 +118,6 @@ simple_find_tool_program () { # program_name, var_name_to_export_full_path, is_o echo -e "....${COLOR_SUCCESS}SUCCESS: $2 found as $TMP_VAL" "${COLOR_RESET}" return 0 fi - #TMP_CMD="export $2=/opt/local/bin/$1" - #$TMP_CMD - #TMP_CMD="echo ${!2}" - #TMP_VAL="$($TMP_CMD)" - #if [ -f "$TMP_VAL" ]; - #then - # #echo -e "${COLOR_SUCCESS}SUCCESS: $2 found as $TMP_VAL" "${COLOR_RESET}" - # return 0 - #fi fi if [ -f "$TMP_VAL" ]; then @@ -320,12 +311,12 @@ then else if [ "$UNIX_SYSTEM_NAME" = "Linux" ]; then - export CC=$(which gcc-7) + export CC=$(which gcc-9) if [ -z "${CC}" ]; then export CC=$(which gcc) fi - export CXX=$(which g++-7) + export CXX=$(which g++-9) if [ -z "${CXX}" ]; then export CXX=$(which g++) @@ -577,14 +568,14 @@ then if [ ! -d "emsdk" ]; then echo -e "${COLOR_INFO}downloading it${COLOR_DOTS}...${COLOR_RESET}" - git clone https://github.com/emscripten-core/emsdk.git + eval git clone https://github.com/emscripten-core/emsdk.git fi cd emsdk echo -e "${COLOR_INFO}configuring it${COLOR_DOTS}...${COLOR_RESET}" - git pull - git checkout 2.0.31 - ./emsdk install latest - ./emsdk activate latest + eval git pull + eval git checkout 2.0.31 + eval ./emsdk install latest + eval ./emsdk activate latest source ./emsdk_env.sh cd .. fi @@ -600,9 +591,8 @@ then then if [ ! -f "boost_1_68_0.tar.bz2" ]; then - echo -e "${COLOR_INFO}downloading it${COLOR_DOTS}...${COLOR_RESET}" - # $WGET https://dl.bintray.com/boostorg/release/1.68.0/source/boost_1_68_0.tar.gz - $WGET https://boostorg.jfrog.io/artifactory/main/release/1.68.0/source/boost_1_68_0.tar.bz2 + eval echo -e "${COLOR_INFO}downloading it${COLOR_DOTS}...${COLOR_RESET}" + eval "$WGET" https://boostorg.jfrog.io/artifactory/main/release/1.68.0/source/boost_1_68_0.tar.bz2 fi echo -e "${COLOR_INFO}unpacking it${COLOR_DOTS}...${COLOR_RESET}" tar -xf boost_1_68_0.tar.bz2 @@ -615,25 +605,25 @@ then else BOOST_LIBRARIES="system,thread,filesystem,regex,atomic,program_options" fi - ./bootstrap.sh --prefix="$INSTALL_ROOT" --with-libraries="$BOOST_LIBRARIES" + eval ./bootstrap.sh --prefix="$INSTALL_ROOT" --with-libraries="$BOOST_LIBRARIES" if [ ${ARCH} = "arm" ] then sed -i -e 's#using gcc ;#using gcc : arm : /usr/local/toolchains/gcc7.2-arm/bin/arm-linux-gnueabihf-g++ ;#g' project-config.jam - ./b2 "${CONF_CROSSCOMPILING_OPTS_BOOST}" cxxflags=-fPIC cflags=-fPIC ${PARALLEL_MAKE_OPTIONS} --prefix="$INSTALL_ROOT" --layout=system variant=debug link=static threading=multi install + eval ./b2 "${CONF_CROSSCOMPILING_OPTS_BOOST}" cxxflags=-fPIC cflags=-fPIC "${PARALLEL_MAKE_OPTIONS}" --prefix="$INSTALL_ROOT" --layout=system variant=debug link=static threading=multi install else if [ "$UNIX_SYSTEM_NAME" = "Darwin" ]; then - ./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=14 cflags=-fPIC "${PARALLEL_MAKE_OPTIONS}" --prefix="$INSTALL_ROOT" --layout=system variant=debug link=static threading=multi install else if [[ "${WITH_EMSCRIPTEN}" -eq 1 ]]; then - ./b2 toolset=emscripten cxxflags=-fPIC cxxstd=14 cflags=-fPIC ${PARALLEL_MAKE_OPTIONS} --prefix="$INSTALL_ROOT" --disable-icu --layout=system variant=debug link=static install + eval ./b2 toolset=emscripten cxxflags=-fPIC cxxstd=14 cflags=-fPIC "${PARALLEL_MAKE_OPTIONS}" --prefix="$INSTALL_ROOT" --disable-icu --layout=system variant=debug link=static install cd bin.v2/libs/program_options/build/emscripten-2.0.31/debug/cxxstd-14-iso/link-static/threading-multi/ - emar q libboost_program_options.a *.bc - cp libboost_program_options.a "${LIBRARIES_ROOT}" + eval emar q "libboost_program_options.a" ./*.bc + eval cp "libboost_program_options.a" "${LIBRARIES_ROOT}" else - ./b2 cxxflags=-fPIC cxxstd=14 cflags=-fPIC ${PARALLEL_MAKE_OPTIONS} --prefix="$INSTALL_ROOT" --layout=system variant=debug link=static threading=multi install + eval ./b2 cxxflags=-fPIC cxxstd=14 cflags=-fPIC "${PARALLEL_MAKE_OPTIONS}" --prefix="$INSTALL_ROOT" --layout=system variant=debug link=static threading=multi install fi fi fi @@ -660,17 +650,17 @@ then if [ ! -f "openssl-from-git.tar.gz" ]; then echo -e "${COLOR_INFO}getting it from git${COLOR_DOTS}...${COLOR_RESET}" - git clone https://github.com/openssl/openssl.git + eval git clone https://github.com/openssl/openssl.git echo -e "${COLOR_INFO}archiving it${COLOR_DOTS}...${COLOR_RESET}" - tar -czf openssl-from-git.tar.gz ./openssl + eval tar -czf openssl-from-git.tar.gz ./openssl else echo -e "${COLOR_INFO}unpacking it${COLOR_DOTS}...${COLOR_RESET}" - tar -xzf openssl-from-git.tar.gz + eval tar -xzf openssl-from-git.tar.gz fi echo -e "${COLOR_INFO}configuring it${COLOR_DOTS}...${COLOR_RESET}" cd openssl - git fetch - git checkout OpenSSL_1_1_1-stable + eval git fetch + eval git checkout OpenSSL_1_1_1-stable if [ "$ARCH" = "x86_or_x64" ]; then if [ "$UNIX_SYSTEM_NAME" = "Darwin" ]; @@ -680,14 +670,14 @@ then else if [[ "${WITH_EMSCRIPTEN}" -eq 1 ]]; then - emconfigure ./config -fPIC -no-asm -no-shared -no-threads --prefix="$INSTALL_ROOT" --openssldir="$INSTALL_ROOT" + eval emconfigure ./config -fPIC -no-asm -no-shared -no-threads --prefix="$INSTALL_ROOT" --openssldir="$INSTALL_ROOT" sed -i 's/CROSS_COMPILE=.*/CROSS_COMPILE=/' Makefile else - ./config -fPIC --prefix="$INSTALL_ROOT" --openssldir="$INSTALL_ROOT" + eval ./config -fPIC --prefix="$INSTALL_ROOT" --openssldir="$INSTALL_ROOT" fi fi else - ./Configure linux-armv4 --prefix="$INSTALL_ROOT" "${ADDITIONAL_INCLUDES}" "${ADDITIONAL_LIBRARIES}" no-shared no-tests no-dso + eval ./Configure linux-armv4 --prefix="$INSTALL_ROOT" "${ADDITIONAL_INCLUDES}" "${ADDITIONAL_LIBRARIES}" no-shared no-tests no-dso fi cd .. fi @@ -695,13 +685,13 @@ then cd openssl if [[ "${WITH_EMSCRIPTEN}" -eq 1 ]]; then - emmake "$MAKE" "${PARALLEL_MAKE_OPTIONS}" depend - emmake "$MAKE" "${PARALLEL_MAKE_OPTIONS}" + eval emmake "$MAKE" "${PARALLEL_MAKE_OPTIONS}" depend + eval emmake "$MAKE" "${PARALLEL_MAKE_OPTIONS}" else - $MAKE ${PARALLEL_MAKE_OPTIONS} depend - $MAKE ${PARALLEL_MAKE_OPTIONS} + eval "$MAKE" "${PARALLEL_MAKE_OPTIONS}" depend + eval "$MAKE" "${PARALLEL_MAKE_OPTIONS}" fi - $MAKE ${PARALLEL_MAKE_OPTIONS} install_sw + eval "$MAKE" "${PARALLEL_MAKE_OPTIONS}" install_sw cd "$SOURCES_ROOT" else echo -e "${COLOR_SUCCESS}SKIPPED${COLOR_RESET}" @@ -721,32 +711,32 @@ then if [ ! -f "gmp-6.1.2.tar.xz" ]; then echo -e "${COLOR_INFO}getting it from gmp website${COLOR_DOTS}...${COLOR_RESET}" - $WGET https://ftp.gnu.org/gnu/gmp/gmp-6.1.2.tar.xz + eval "$WGET" https://ftp.gnu.org/gnu/gmp/gmp-6.1.2.tar.xz fi echo -e "${COLOR_INFO}unpacking it${COLOR_DOTS}...${COLOR_RESET}" - tar -xf gmp-6.1.2.tar.xz + eval tar -xf gmp-6.1.2.tar.xz fi cd gmp-6.1.2 echo -e "${COLOR_INFO}configuring it${COLOR_DOTS}...${COLOR_RESET}" if [ "$UNIX_SYSTEM_NAME" = "Darwin" ]; then - ./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 --build=x86_64-apple-darwin#{OS.kernel_version.major} --prefix="$INSTALL_ROOT" else if [[ "${WITH_EMSCRIPTEN}" -eq 1 ]]; then - emconfigure ./configure "${CONF_CROSSCOMPILING_OPTS_GENERIC}" "${CONF_CROSSCOMPILING_OPTS_GMP}" "${CONF_DEBUG_OPTIONS}" --disable-assembly --host none --enable-cxx --prefix="$INSTALL_ROOT" + eval emconfigure ./configure "${CONF_CROSSCOMPILING_OPTS_GENERIC}" "${CONF_CROSSCOMPILING_OPTS_GMP}" "${CONF_DEBUG_OPTIONS}" --disable-assembly --host none --enable-cxx --prefix="$INSTALL_ROOT" else - ./configure ${CONF_CROSSCOMPILING_OPTS_GENERIC} ${CONF_CROSSCOMPILING_OPTS_GMP} ${CONF_DEBUG_OPTIONS} --enable-cxx --enable-static --disable-shared --prefix="$INSTALL_ROOT" + eval ./configure "${CONF_CROSSCOMPILING_OPTS_GENERIC}" "${CONF_CROSSCOMPILING_OPTS_GMP}" "${CONF_DEBUG_OPTIONS}" --enable-cxx --enable-static --disable-shared --prefix="$INSTALL_ROOT" fi fi echo -e "${COLOR_INFO}building it${COLOR_DOTS}...${COLOR_RESET}" if [[ "${WITH_EMSCRIPTEN}" -eq 1 ]]; then - emmake "$MAKE" "${PARALLEL_MAKE_OPTIONS}" + eval emmake "$MAKE" "${PARALLEL_MAKE_OPTIONS}" else - $MAKE ${PARALLEL_MAKE_OPTIONS} + eval "$MAKE" "${PARALLEL_MAKE_OPTIONS}" fi - $MAKE ${PARALLEL_MAKE_OPTIONS} install + eval "$MAKE" "${PARALLEL_MAKE_OPTIONS}" install cd .. cd "$SOURCES_ROOT" else @@ -764,25 +754,25 @@ then if [ ! -d "libff" ]; then echo -e "${COLOR_INFO}getting it from git${COLOR_DOTS}...${COLOR_RESET}" - git clone https://github.com/scipr-lab/libff.git --recursive # libff + eval git clone https://github.com/scipr-lab/libff.git --recursive # libff fi cd libff echo -e "${COLOR_INFO}configuring it${COLOR_DOTS}...${COLOR_RESET}" - git fetch - git checkout 03b719a7c81757071f99fc60be1f7f7694e51390 - mkdir -p build + eval git fetch + eval git checkout 03b719a7c81757071f99fc60be1f7f7694e51390 + eval mkdir -p build cd build echo -e "${COLOR_INFO}building it${COLOR_DOTS}...${COLOR_RESET}" if [[ "${WITH_EMSCRIPTEN}" -eq 1 ]]; then simple_find_tool_program "cmake" "CMAKE" "no" - emcmake "$CMAKE" "${CMAKE_CROSSCOMPILING_OPTS}" -DCMAKE_INSTALL_PREFIX="$INSTALL_ROOT" -DCMAKE_BUILD_TYPE="$TOP_CMAKE_BUILD_TYPE" -DGMP_INCLUDE_DIR="$INCLUDE_ROOT" -DGMP_LIBRARY="$LIBRARIES_ROOT" -DWITH_PROCPS=OFF -DCURVE=ALT_BN128 -DUSE_ASM=OFF .. - emmake "$MAKE" "${PARALLEL_MAKE_OPTIONS}" + eval emcmake "$CMAKE" "${CMAKE_CROSSCOMPILING_OPTS}" -DCMAKE_INSTALL_PREFIX="$INSTALL_ROOT" -DCMAKE_BUILD_TYPE="$TOP_CMAKE_BUILD_TYPE" -DGMP_INCLUDE_DIR="$INCLUDE_ROOT" -DGMP_LIBRARY="$LIBRARIES_ROOT" -DWITH_PROCPS=OFF -DCURVE=ALT_BN128 -DUSE_ASM=OFF .. + eval emmake "$MAKE" "${PARALLEL_MAKE_OPTIONS}" else - $CMAKE "${CMAKE_CROSSCOMPILING_OPTS}" -DCMAKE_INSTALL_PREFIX="$INSTALL_ROOT" -DCMAKE_BUILD_TYPE="$TOP_CMAKE_BUILD_TYPE" .. -DWITH_PROCPS=OFF - $MAKE ${PARALLEL_MAKE_OPTIONS} + eval "$CMAKE" "${CMAKE_CROSSCOMPILING_OPTS}" -DCMAKE_INSTALL_PREFIX="$INSTALL_ROOT" -DCMAKE_BUILD_TYPE="$TOP_CMAKE_BUILD_TYPE" .. -DWITH_PROCPS=OFF + eval "$MAKE" "${PARALLEL_MAKE_OPTIONS}" fi - $MAKE ${PARALLEL_MAKE_OPTIONS} install + eval "$MAKE" "${PARALLEL_MAKE_OPTIONS}" install cd "$SOURCES_ROOT" else echo -e "${COLOR_SUCCESS}SKIPPED${COLOR_RESET}"