From db0e7a7e4b741f528b3fb1875417f57ced90578d Mon Sep 17 00:00:00 2001 From: Wetitpig Date: Sun, 9 Aug 2020 09:20:58 +0800 Subject: [PATCH 1/5] Add solidity --- packages/solidity/build.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 packages/solidity/build.sh diff --git a/packages/solidity/build.sh b/packages/solidity/build.sh new file mode 100644 index 000000000..771fcb07d --- /dev/null +++ b/packages/solidity/build.sh @@ -0,0 +1,8 @@ +TERMUX_PKG_HOMEPAGE=https://solidity.readthedocs.io +TERMUX_PKG_DESCRIPTION="An Etherem smart contract-oriented language." +TERMUX_PKG_LICENSE="GPL-3.0" +TERMUX_PKG_VERSION=0.7.0 +TERMUX_PKG_SRCURL=https://github.com/ethereum/solidity/archive/v${TERMUX_PKG_VERSION}.tar.gz +TERMUX_PKG_SHA256=11104522684d6869e01f7fb0ddf3cfd6475c06ee2f1203d65e8bf636ddc7053f +TERMUX_PKG_DEPENDS="boost-static, z3" + From cb619351d118ce4912aec388fbb040ef4338c090 Mon Sep 17 00:00:00 2001 From: Wetitpig Date: Sun, 9 Aug 2020 09:39:37 +0800 Subject: [PATCH 2/5] Fix link to release --- packages/solidity/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/solidity/build.sh b/packages/solidity/build.sh index 771fcb07d..cd5f7e1db 100644 --- a/packages/solidity/build.sh +++ b/packages/solidity/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://solidity.readthedocs.io TERMUX_PKG_DESCRIPTION="An Etherem smart contract-oriented language." TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=0.7.0 -TERMUX_PKG_SRCURL=https://github.com/ethereum/solidity/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=11104522684d6869e01f7fb0ddf3cfd6475c06ee2f1203d65e8bf636ddc7053f +TERMUX_PKG_SRCURL=https://github.com/ethereum/solidity/releases/download/v${TERMUX_PKG_VERSION}/solidity_${TERMUX_PKG_VERSION}.tar.gz +TERMUX_PKG_SHA256=86e782a88eaaf4aa98f4e1e915f46b5bc5f596ea86c784fb911dc6e4c04309bf TERMUX_PKG_DEPENDS="boost-static, z3" From 8b8c12722fb64e337c087df4569468644014c658 Mon Sep 17 00:00:00 2001 From: Wetitpig Date: Sun, 9 Aug 2020 09:55:26 +0800 Subject: [PATCH 3/5] Don't use z3 --- packages/solidity/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/solidity/build.sh b/packages/solidity/build.sh index cd5f7e1db..f3baab816 100644 --- a/packages/solidity/build.sh +++ b/packages/solidity/build.sh @@ -4,5 +4,5 @@ TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=0.7.0 TERMUX_PKG_SRCURL=https://github.com/ethereum/solidity/releases/download/v${TERMUX_PKG_VERSION}/solidity_${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=86e782a88eaaf4aa98f4e1e915f46b5bc5f596ea86c784fb911dc6e4c04309bf -TERMUX_PKG_DEPENDS="boost-static, z3" - +TERMUX_PKG_DEPENDS="boost-static" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DUSE_Z3=OFF -DUSE_CVC4=OFF" From 72fc89789fb5de32d3faa3c28613cfce13fce8ee Mon Sep 17 00:00:00 2001 From: Wetitpig Date: Sun, 9 Aug 2020 13:18:28 +0800 Subject: [PATCH 4/5] Remove -Werror --- packages/solidity/EthCompilerSettings.cmake.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 packages/solidity/EthCompilerSettings.cmake.patch diff --git a/packages/solidity/EthCompilerSettings.cmake.patch b/packages/solidity/EthCompilerSettings.cmake.patch new file mode 100644 index 000000000..7d62f3d68 --- /dev/null +++ b/packages/solidity/EthCompilerSettings.cmake.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake +index 3bcdad47b..e7d2a82b8 100644 +--- a/cmake/EthCompilerSettings.cmake ++++ b/cmake/EthCompilerSettings.cmake +@@ -46,7 +46,6 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA + # to fix warnings as they arise, so they don't accumulate "to be fixed later". + add_compile_options(-Wall) + add_compile_options(-Wextra) +- add_compile_options(-Werror) + add_compile_options(-pedantic) + add_compile_options(-Wno-unknown-pragmas) + add_compile_options(-Wimplicit-fallthrough) From 32e39f7d8f2d6eedda33d9c771cd7321a64d0e28 Mon Sep 17 00:00:00 2001 From: Wetitpig Date: Mon, 10 Aug 2020 07:55:26 +0800 Subject: [PATCH 5/5] Use gold linker --- packages/solidity/EthCompilerSettings.cmake.patch | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/solidity/EthCompilerSettings.cmake.patch b/packages/solidity/EthCompilerSettings.cmake.patch index 7d62f3d68..f86320580 100644 --- a/packages/solidity/EthCompilerSettings.cmake.patch +++ b/packages/solidity/EthCompilerSettings.cmake.patch @@ -1,5 +1,5 @@ diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake -index 3bcdad47b..e7d2a82b8 100644 +index 3bcdad47b..0c288288f 100644 --- a/cmake/EthCompilerSettings.cmake +++ b/cmake/EthCompilerSettings.cmake @@ -46,7 +46,6 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA @@ -10,3 +10,14 @@ index 3bcdad47b..e7d2a82b8 100644 add_compile_options(-pedantic) add_compile_options(-Wno-unknown-pragmas) add_compile_options(-Wimplicit-fallthrough) +@@ -208,9 +207,6 @@ option(USE_CVC4 "Allow compiling with CVC4 SMT solver integration" ON) + if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")) + option(USE_LD_GOLD "Use GNU gold linker" ON) + if (USE_LD_GOLD) +- execute_process(COMMAND ${CMAKE_CXX_COMPILER} -fuse-ld=gold -Wl,--version ERROR_QUIET OUTPUT_VARIABLE LD_VERSION) +- if ("${LD_VERSION}" MATCHES "GNU gold") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold") +- endif () ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold") + endif () + endif ()