From 0b6f0d6ef58d0e6f9e5a004bfd8ef83976cd412d Mon Sep 17 00:00:00 2001 From: thaipandada Date: Sun, 8 Mar 2020 16:39:13 +0800 Subject: [PATCH 1/3] fix fc commitid --- libraries/fc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/fc b/libraries/fc index ac3bee8650b..5ac1fd76872 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit ac3bee8650b9090a1a66366392fd882cfe7931c8 +Subproject commit 5ac1fd7687261511c4a6a1866c5ade4b867390f8 From 81be41ebbbb2218a38a77e02e2f474552c62c2a5 Mon Sep 17 00:00:00 2001 From: thaipandada Date: Sun, 8 Mar 2020 17:31:14 +0800 Subject: [PATCH 2/3] update libraries/fc --- CMakeLists.txt | 2 +- libraries/fc | 2 +- scripts/eosio_build_darwin.sh | 8 +++++--- tests/CMakeLists.txt | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f92cce262d6..d4c2aaf1e23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -230,7 +230,7 @@ add_subdirectory( plugins ) add_subdirectory( programs ) add_subdirectory( scripts ) add_subdirectory( unittests ) -add_subdirectory( tests ) +#add_subdirectory( tests ) add_subdirectory( tools ) add_subdirectory( debian ) diff --git a/libraries/fc b/libraries/fc index 5ac1fd76872..ac3bee8650b 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit 5ac1fd7687261511c4a6a1866c5ade4b867390f8 +Subproject commit ac3bee8650b9090a1a66366392fd882cfe7931c8 diff --git a/scripts/eosio_build_darwin.sh b/scripts/eosio_build_darwin.sh index 260e2f8ffa5..70c4c89d7fb 100644 --- a/scripts/eosio_build_darwin.sh +++ b/scripts/eosio_build_darwin.sh @@ -23,7 +23,9 @@ printf "\\tPhysical Memory: %s Gbytes\\n" "${MEM_GIG}" printf "\\tDisk install: %s\\n" "${DISK_INSTALL}" printf "\\tDisk space total: %sG\\n" "${DISK_TOTAL}" - printf "\\tDisk space available: %sG\\n\\n" "${DISK_AVAIL}" + printf "\\tDisk space available: %sG\\n" "${DISK_AVAIL}" + printf "\\tTEMP_DIR: %s\\n\\n" "${TEMP_DIR}" + if [ "${MEM_GIG}" -lt 7 ]; then echo "Your system must have 7 or more Gigabytes of physical memory installed." @@ -430,7 +432,7 @@ printf "\\tExiting now.\\n\\n" exit 1; fi - if ! git clone --depth 1 --single-branch --branch release_70 https://github.com/llvm-mirror/llvm.git + if ! git clone --depth 1 --single-branch --branch release_90 https://github.com/llvm-mirror/llvm.git then printf "\\tUnable to clone llvm repo @ https://github.com/llvm-mirror/llvm.git.\\n" printf "\\tExiting now.\\n\\n" @@ -442,7 +444,7 @@ printf "\\tExiting now.\\n\\n" exit 1; fi - if ! git clone --depth 1 --single-branch --branch release_40 https://github.com/llvm-mirror/clang.git + if ! git clone --depth 1 --single-branch --branch release_90 https://github.com/llvm-mirror/clang.git then printf "\\tUnable to clone clang repo @ https://github.com/llvm-mirror/clang.git.\\n" printf "\\tExiting now.\\n\\n" diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1b45e157721..6e1b5c83c33 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -9,7 +9,7 @@ find_package(LLVM 7.1 REQUIRED CONFIG) link_directories(${LLVM_LIBRARY_DIR}) -set( CMAKE_CXX_STANDARD 14 ) +set( CMAKE_CXX_STANDARD 17 ) include_directories("${CMAKE_SOURCE_DIR}/plugins/wallet_plugin/include") From ecdab54c2c2574559e5a4596b855c11dd3fd0ddf Mon Sep 17 00:00:00 2001 From: thaipandada Date: Sun, 8 Mar 2020 21:45:49 +0800 Subject: [PATCH 3/3] enable tests complie --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d4c2aaf1e23..f92cce262d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -230,7 +230,7 @@ add_subdirectory( plugins ) add_subdirectory( programs ) add_subdirectory( scripts ) add_subdirectory( unittests ) -#add_subdirectory( tests ) +add_subdirectory( tests ) add_subdirectory( tools ) add_subdirectory( debian )