diff --git a/lang/solidity/Makefile b/lang/solidity/Makefile index a962dea75..028f90e3d 100644 --- a/lang/solidity/Makefile +++ b/lang/solidity/Makefile @@ -1,6 +1,6 @@ COMMENT= solidity contract oriented programming language -V= 0.8.21 +V= 0.8.27 DISTNAME= solidity_${V} PKGNAME= solidity-${V} @@ -13,7 +13,7 @@ MAINTAINER= Purple Rain # GPL-3.0 PERMIT_PACKAGE= Yes -SITES= https://github.com/ethereum/solidity/releases/download/v0.8.21/ +SITES= https://github.com/ethereum/solidity/releases/download/v${V}/ WANTLIB+= c m gmp pthread z3 ${COMPILER_LIBCXX} diff --git a/lang/solidity/distinfo b/lang/solidity/distinfo index ac90958bb..3a724a9fa 100644 --- a/lang/solidity/distinfo +++ b/lang/solidity/distinfo @@ -1,2 +1,2 @@ -SHA256 (solidity_0.8.21.tar.gz) = bRu45yhQMg5y14hXX2vSXdSTDLbdnt01pZJmpG9hDRM= -SIZE (solidity_0.8.21.tar.gz) = 4055931 +SHA256 (solidity_0.8.27.tar.gz) = sBXgVGjz2nkciyUusgH6XLH2JkLWKF7SqEWxQvlvyKY= +SIZE (solidity_0.8.27.tar.gz) = 12616162 diff --git a/lang/solidity/patches/patch-cmake_fmtlib_cmake b/lang/solidity/patches/patch-cmake_fmtlib_cmake deleted file mode 100644 index f3d435400..000000000 --- a/lang/solidity/patches/patch-cmake_fmtlib_cmake +++ /dev/null @@ -1,25 +0,0 @@ -Index: cmake/fmtlib.cmake ---- cmake/fmtlib.cmake.orig -+++ cmake/fmtlib.cmake -@@ -1,20 +1 @@ --include(FetchContent) -- --FetchContent_Declare( -- fmtlib -- PREFIX "${PROJECT_BINARY_DIR}/deps" -- DOWNLOAD_DIR "${PROJECT_SOURCE_DIR}/deps/downloads" -- DOWNLOAD_NAME fmt-8.0.1.tar.gz -- URL https://github.com/fmtlib/fmt/archive/8.0.1.tar.gz -- URL_HASH SHA256=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01 --) -- --if (CMAKE_VERSION VERSION_LESS "3.14.0") -- FetchContent_GetProperties(fmtlib) -- if (NOT fmtlib_POPULATED) -- FetchContent_Populate(fmtlib) -- add_subdirectory(${fmtlib_SOURCE_DIR} ${fmtlib_BINARY_DIR}) -- endif() --else() -- FetchContent_MakeAvailable(fmtlib) --endif() -+find_package(fmt REQUIRED) diff --git a/lang/solidity/patches/patch-cmake_range-v3_cmake b/lang/solidity/patches/patch-cmake_range-v3_cmake deleted file mode 100644 index 5337aca2d..000000000 --- a/lang/solidity/patches/patch-cmake_range-v3_cmake +++ /dev/null @@ -1,40 +0,0 @@ -Index: cmake/range-v3.cmake ---- cmake/range-v3.cmake.orig -+++ cmake/range-v3.cmake -@@ -1,36 +1,5 @@ --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 "${PROJECT_BINARY_DIR}/deps") --set(RANGE_V3_INCLUDE_DIR "${prefix}/include") -- --ExternalProject_Add(range-v3-project -- PREFIX "${prefix}" -- DOWNLOAD_DIR "${PROJECT_SOURCE_DIR}/deps/downloads" -- DOWNLOAD_NAME range-v3-0.12.0.tar.gz -- URL https://github.com/ericniebler/range-v3/archive/0.12.0.tar.gz -- URL_HASH SHA256=015adb2300a98edfceaf0725beec3337f542af4915cec4d0b89fa0886f4ba9cb -- CMAKE_COMMAND ${RANGE_V3_CMAKE_COMMAND} -- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX= -- -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 "\$<\$:/permissive->" - INTERFACE_SYSTEM_INCLUDE_DIRECTORIES ${RANGE_V3_INCLUDE_DIR}