diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2021-01-28 15:21:16 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2021-01-28 15:21:16 +0000 |
| commit | 1104d5eca51b030bc432b3c04aa581c93c6c53dc (patch) | |
| tree | 279ddb363de46036c390c872a8efc30b0fd6bd8b | |
| parent | news/fidogate: Update to 5.10-3 (diff) | |
Update to 0.8.1 release.
| -rw-r--r-- | lang/solidity/Makefile | 7 | ||||
| -rw-r--r-- | lang/solidity/distinfo | 6 | ||||
| -rw-r--r-- | lang/solidity/files/patch-cmake_range-v3.cmake | 39 |
3 files changed, 46 insertions, 6 deletions
diff --git a/lang/solidity/Makefile b/lang/solidity/Makefile index 8b47387be619..593d8fcf6af0 100644 --- a/lang/solidity/Makefile +++ b/lang/solidity/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= solidity -PORTVERSION= 0.8.0 +PORTVERSION= 0.8.1 CATEGORIES= lang MASTER_SITES= https://github.com/ethereum/solidity/releases/download/v${PORTVERSION}/ DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -15,7 +15,8 @@ LICENSE= GPLv3 NOT_FOR_ARCHS= powerpc powerpc64 powerpcspe sparc64 NOT_FOR_ARCHS_REASON= solidity currently does not support big endian systems -BUILD_DEPENDS= boost-libs>=0:devel/boost-libs +BUILD_DEPENDS= boost-libs>=0:devel/boost-libs \ + range-v3>=0:devel/range-v3 LIB_DEPENDS= libjsoncpp.so:devel/jsoncpp USES= cmake compiler:c++14-lang @@ -30,6 +31,7 @@ Z3_CMAKE_OFF= USE_Z3 CVC4_CMAKE_OFF= USE_CVC4 CMAKE_ARGS+= -DUSE_LD_GOLD=OFF -DTESTS=OFF \ + -DRANGE_V3_INCLUDE_DIR="${LOCALBASE}/include" \ -DJSONCPP_INCLUDE_DIR:STRING="${LOCALBASE}/include/jsoncpp" \ -DJSONCPP_LIB_DIR:STRING="${LOCALBASE}/lib" @@ -37,7 +39,6 @@ PLIST_FILES= bin/solc \ bin/solidity-upgrade \ bin/yul-phaser - pre-patch: @${CP} ${FILESDIR}/jsoncpp.cmake ${WRKSRC}/cmake/ @${REINPLACE_CMD} '/EthCcache/d' ${WRKSRC}/CMakeLists.txt diff --git a/lang/solidity/distinfo b/lang/solidity/distinfo index e37a64707a4c..84e47ee69482 100644 --- a/lang/solidity/distinfo +++ b/lang/solidity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1608206279 -SHA256 (solidity_0.8.0.tar.gz) = 5a8f9f421dcf65d552b2e6fea4929aef68706a8db8b2e626e7a81e4e5ee11549 -SIZE (solidity_0.8.0.tar.gz) = 2538492 +TIMESTAMP = 1611823986 +SHA256 (solidity_0.8.1.tar.gz) = b28b2af228ca583efe7a44b18a622218df333962dce26edaa1d5dad9b1a60d47 +SIZE (solidity_0.8.1.tar.gz) = 2616760 diff --git a/lang/solidity/files/patch-cmake_range-v3.cmake b/lang/solidity/files/patch-cmake_range-v3.cmake new file mode 100644 index 000000000000..84fc7ebb676c --- /dev/null +++ b/lang/solidity/files/patch-cmake_range-v3.cmake @@ -0,0 +1,39 @@ +--- cmake/range-v3.cmake.orig 2021-01-28 15:15:15 UTC ++++ cmake/range-v3.cmake +@@ -1,36 +1,11 @@ +-include(ExternalProject) +- + if (${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten") + set(RANGE_V3_CMAKE_COMMAND emcmake cmake) + else() + set(RANGE_V3_CMAKE_COMMAND ${CMAKE_COMMAND}) + endif() + +-set(prefix "${CMAKE_BINARY_DIR}/deps") +-set(RANGE_V3_INCLUDE_DIR "${prefix}/include") +- +-ExternalProject_Add(range-v3-project +- PREFIX "${prefix}" +- DOWNLOAD_DIR "${CMAKE_SOURCE_DIR}/deps/downloads" +- DOWNLOAD_NAME range-v3-0.11.0.tar.gz +- URL https://github.com/ericniebler/range-v3/archive/0.11.0.tar.gz +- URL_HASH SHA256=376376615dbba43d3bef75aa590931431ecb49eb36d07bb726a19f680c75e20c +- CMAKE_COMMAND ${RANGE_V3_CMAKE_COMMAND} +- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> +- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} +- -DBUILD_TESTING=OFF +- -DRANGES_CXX_STD=${CMAKE_CXX_STANDARD} +- -DRANGE_V3_DOCS=OFF +- -DRANGE_V3_EXAMPLES=OFF +- -DRANGE_V3_TESTS=OFF +- -DRANGES_BUILD_CALENDAR_EXAMPLE=OFF +- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} +- BUILD_BYPRODUCTS "${RANGE_V3_INCLUDE_DIR}/range/v3/all.hpp" +-) +- + # Create range-v3 imported library + add_library(range-v3 INTERFACE IMPORTED) +-file(MAKE_DIRECTORY ${RANGE_V3_INCLUDE_DIR}) # Must exist. + set_target_properties(range-v3 PROPERTIES + INTERFACE_COMPILE_OPTIONS "\$<\$<CXX_COMPILER_ID:MSVC>:/permissive->" + INTERFACE_SYSTEM_INCLUDE_DIRECTORIES ${RANGE_V3_INCLUDE_DIR} |