Skip to content

Commit

Permalink
lang/solidity: update to 0.8.27 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
alexdupre committed Sep 5, 2024
1 parent 61ac567 commit bbe1b5a
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 89 deletions.
19 changes: 6 additions & 13 deletions lang/solidity/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PORTNAME= solidity
PORTVERSION= 0.8.26
PORTVERSION= 0.8.27
CATEGORIES= lang
MASTER_SITES= https://github.com/ethereum/solidity/releases/download/v${PORTVERSION}/
DISTNAME= ${PORTNAME}_${PORTVERSION}
Expand All @@ -21,21 +21,18 @@ BUILD_DEPENDS= boost-libs>=0:devel/boost-libs \
USES= cmake compiler:c++14-lang cpe
CPE_VENDOR= ${PORTNAME}lang

OPTIONS_DEFINE= Z3 CVC4
OPTIONS_DEFAULT=Z3 #CVC4
OPTIONS_DEFINE= Z3 CVC5
OPTIONS_DEFAULT=Z3
OPTIONS_EXCLUDE_i386= Z3
Z3_DESC= SMT Checker via Z3
CVC4_DESC= SMT Checker via CVC4
CVC5_DESC= SMT Checker via CVC5
Z3_LIB_DEPENDS= libz3.so:math/z3
CVC4_LIB_DEPENDS= libcvc5.so:math/cvc5 libgmp.so:math/gmp
CVC5_RUN_DEPENDS= cvc5:math/cvc5
Z3_CMAKE_OFF= USE_Z3
CVC4_CMAKE_OFF= USE_CVC4
CVC4_BROKEN= solidity uses cvc4 which has been succeeded by cvc5

CMAKE_ARGS+= -DUSE_LD_GOLD=OFF -DTESTS=OFF \
-DUSE_SYSTEM_LIBRARIES=ON \
-DIGNORE_VENDORED_DEPENDENCIES=ON \
-DRANGE_V3_INCLUDE_DIR="${LOCALBASE}/include" \
-DNLOHMANN_JSON_INCLUDE_DIR="${LOCALBASE}/include" \
-DSTRICT_NLOHMANN_JSON_VERSION=OFF \
-DSTRICT_Z3_VERSION=OFF

Expand All @@ -48,8 +45,4 @@ PLIST_FILES= bin/solc \
CXXFLAGS+= -Wno-unqualified-std-cast-call
.endif

pre-patch:
@${CP} ${FILESDIR}/fmtlib.cmake ${WRKSRC}/cmake/
#@${REINPLACE_CMD} '/EthCcache/d' ${WRKSRC}/CMakeLists.txt

.include <bsd.port.mk>
6 changes: 3 additions & 3 deletions lang/solidity/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1716285738
SHA256 (solidity_0.8.26.tar.gz) = 5d48c9a38e101eb494bc58e20cf3786a8910d89c2ca0073ab04738edd30cf03a
SIZE (solidity_0.8.26.tar.gz) = 3211986
TIMESTAMP = 1725531164
SHA256 (solidity_0.8.27.tar.gz) = b015e05468f3da791c8b252eb201fa5cb1f62642d6285ed2a845b142f96fc8a6
SIZE (solidity_0.8.27.tar.gz) = 12616162
1 change: 0 additions & 1 deletion lang/solidity/files/fmtlib.cmake

This file was deleted.

21 changes: 16 additions & 5 deletions lang/solidity/files/patch-CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,27 @@
--- CMakeLists.txt.orig 2024-05-21 09:44:13 UTC
--- CMakeLists.txt.orig 2024-09-04 09:02:02 UTC
+++ CMakeLists.txt
@@ -44,12 +44,9 @@ mark_as_advanced(STRICT_NLOHMANN_JSON_VERSION)
@@ -52,15 +52,21 @@ mark_as_advanced(ONLY_BUILD_SOLIDITY_LIBRARIES)
mark_as_advanced(IGNORE_VENDORED_DEPENDENCIES)
mark_as_advanced(ONLY_BUILD_SOLIDITY_LIBRARIES)
mark_as_advanced(STRICT_NLOHMANN_JSON_VERSION)

-# Setup cccache.
-include(EthCcache)
-
# Let's find our dependencies
include(EthDependencies)
-if (NOT USE_SYSTEM_LIBRARIES)
+if (USE_SYSTEM_LIBRARIES)
if (NOT IGNORE_VENDORED_DEPENDENCIES)
include(fmtlib)
include(nlohmann-json)
include(range-v3)
+else()
+ # fmtlib
+ find_package(fmt REQUIRED)
+ # nlohmann-json
+ find_package(nlohmann_json REQUIRED)
+ # range-v3
+ add_library(range-v3 INTERFACE IMPORTED)
+ set_target_properties(range-v3 PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES ${RANGE_V3_INCLUDE_DIR})
endif()

find_package(Threads)
28 changes: 0 additions & 28 deletions lang/solidity/files/patch-cmake_nlohmann-json.cmake

This file was deleted.

39 changes: 0 additions & 39 deletions lang/solidity/files/patch-cmake_range-v3.cmake

This file was deleted.

0 comments on commit bbe1b5a

Please sign in to comment.