diff options
Diffstat (limited to 'lang')
-rw-r--r-- | lang/chez-scheme/Makefile | 2 | ||||
-rw-r--r-- | lang/chez-scheme/distinfo | 6 | ||||
-rw-r--r-- | lang/go124/Makefile | 2 | ||||
-rw-r--r-- | lang/go124/distinfo | 6 | ||||
-rw-r--r-- | lang/julia/Makefile | 2 | ||||
-rw-r--r-- | lang/kturtle/distinfo | 6 | ||||
-rw-r--r-- | lang/nim/Makefile | 2 | ||||
-rw-r--r-- | lang/nim/distinfo | 6 | ||||
-rw-r--r-- | lang/nim/files/patch-koch.nim | 43 | ||||
-rw-r--r-- | lang/nim/files/patch-tools_deps.nim | 18 | ||||
-rw-r--r-- | lang/njs/Makefile | 5 | ||||
-rw-r--r-- | lang/njs/distinfo | 6 | ||||
-rw-r--r-- | lang/pharo/Makefile | 1 | ||||
-rw-r--r-- | lang/php83/Makefile | 2 | ||||
-rw-r--r-- | lang/php83/distinfo | 6 | ||||
-rw-r--r-- | lang/php84/Makefile | 2 | ||||
-rw-r--r-- | lang/php84/distinfo | 6 | ||||
-rw-r--r-- | lang/ruby32/Makefile | 3 | ||||
-rw-r--r-- | lang/scala/Makefile | 4 | ||||
-rw-r--r-- | lang/scala/distinfo | 6 | ||||
-rw-r--r-- | lang/solidity/Makefile | 13 | ||||
-rw-r--r-- | lang/solidity/distinfo | 6 | ||||
-rw-r--r-- | lang/solidity/files/patch-CMakeLists.txt | 17 | ||||
-rw-r--r-- | lang/solidity/files/patch-libevmasm_Assembly.cpp | 4 | ||||
-rw-r--r-- | lang/solidity/files/patch-libevmasm_Instruction.h | 6 | ||||
-rw-r--r-- | lang/solidity/files/patch-libyul_backends_evm_EVMDialect.cpp | 11 |
26 files changed, 97 insertions, 94 deletions
diff --git a/lang/chez-scheme/Makefile b/lang/chez-scheme/Makefile index 094cdd7aabfb..e382680ca7f8 100644 --- a/lang/chez-scheme/Makefile +++ b/lang/chez-scheme/Makefile @@ -1,5 +1,5 @@ PORTNAME= chez-scheme -PORTVERSION= 10.1.0 +PORTVERSION= 10.2.0 DISTVERSIONPREFIX= v CATEGORIES= lang MASTER_SITES= https://github.com/cisco/ChezScheme/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/ diff --git a/lang/chez-scheme/distinfo b/lang/chez-scheme/distinfo index e886a7eabc66..714481a643ab 100644 --- a/lang/chez-scheme/distinfo +++ b/lang/chez-scheme/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1731619280 -SHA256 (csv10.1.0.tar.gz) = 9181a6c8c4ab5e5d32d879ff159d335a50d4f8b388611ae22a263e932c35398b -SIZE (csv10.1.0.tar.gz) = 9123504 +TIMESTAMP = 1746612550 +SHA256 (csv10.2.0.tar.gz) = b795916d4cfed59240c5f44b1b507a8657efd28e62e72e134d03486e9f3e374a +SIZE (csv10.2.0.tar.gz) = 9151451 diff --git a/lang/go124/Makefile b/lang/go124/Makefile index b75789bcfa27..6c5877f0e501 100644 --- a/lang/go124/Makefile +++ b/lang/go124/Makefile @@ -1,4 +1,4 @@ -DISTVERSION= 1.24.2 +DISTVERSION= 1.24.3 # Always set PORTREVISION explicitly as otherwise they are inherited from lang/go-devel PORTREVISION= 0 MASTER_SITES= https://golang.org/dl/ diff --git a/lang/go124/distinfo b/lang/go124/distinfo index 8786b1bdd7d3..86f143a69842 100644 --- a/lang/go124/distinfo +++ b/lang/go124/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1743558664 -SHA256 (go1.24.2.src.tar.gz) = 9dc77ffadc16d837a1bf32d99c624cb4df0647cee7b119edd9e7b1bcc05f2e00 -SIZE (go1.24.2.src.tar.gz) = 30787666 +TIMESTAMP = 1746623181 +SHA256 (go1.24.3.src.tar.gz) = 229c08b600b1446798109fae1f569228102c8473caba8104b6418cb5bc032878 +SIZE (go1.24.3.src.tar.gz) = 30789282 SHA256 (go1.23.7.freebsd-arm64.tar.gz) = 2b51c940898fad6708609495b9a27b5869cf5195381fc4a31a013006aa4eb156 SIZE (go1.23.7.freebsd-arm64.tar.gz) = 69903435 SHA256 (go1.23.7.freebsd-amd64.tar.gz) = c0e7a5ff1875eb79d7c2acfa1616718ad892c0b2637d56594fdc3332e313efd4 diff --git a/lang/julia/Makefile b/lang/julia/Makefile index 529f181eef3b..a0c827ea4f5d 100644 --- a/lang/julia/Makefile +++ b/lang/julia/Makefile @@ -1,6 +1,6 @@ PORTNAME= julia DISTVERSION= 1.10.3 -PORTREVISION= 6 +PORTREVISION= 7 DISTVERSIONSUFFIX= -full CATEGORIES= lang math MASTER_SITES= https://github.com/JuliaLang/${PORTNAME}/releases/download/v${DISTVERSION}/ diff --git a/lang/kturtle/distinfo b/lang/kturtle/distinfo index 27fd9c608dea..d0d2e6f8cf61 100644 --- a/lang/kturtle/distinfo +++ b/lang/kturtle/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744564268 -SHA256 (KDE/release-service/25.04.0/kturtle-25.04.0.tar.xz) = a13efe3f12907cd12f13120233d9d259c3a9bcf30157c5306a595130ac2ba8d3 -SIZE (KDE/release-service/25.04.0/kturtle-25.04.0.tar.xz) = 2102584 +TIMESTAMP = 1746557908 +SHA256 (KDE/release-service/25.04.1/kturtle-25.04.1.tar.xz) = 712a2f727dad0762058ba587b0c09c2266b934aa149614232c841b9c267ead7c +SIZE (KDE/release-service/25.04.1/kturtle-25.04.1.tar.xz) = 2102704 diff --git a/lang/nim/Makefile b/lang/nim/Makefile index 9dc636e707b5..0cdb6e211f9f 100644 --- a/lang/nim/Makefile +++ b/lang/nim/Makefile @@ -1,5 +1,5 @@ PORTNAME= nim -DISTVERSION= 2.2.2 +DISTVERSION= 2.2.4 CATEGORIES= lang MASTER_SITES= https://nim-lang.org/download/ diff --git a/lang/nim/distinfo b/lang/nim/distinfo index be7564dd85ad..2d8bda469a9d 100644 --- a/lang/nim/distinfo +++ b/lang/nim/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1739285871 -SHA256 (nim-2.2.2.tar.xz) = 7fcc9b87ac9c0ba5a489fdc26e2d8480ce96a3ca622100d6267ef92135fd8a1f -SIZE (nim-2.2.2.tar.xz) = 8188616 +TIMESTAMP = 1746626689 +SHA256 (nim-2.2.4.tar.xz) = f82b419750fcce561f3f897a0486b180186845d76fb5d99f248ce166108189c7 +SIZE (nim-2.2.4.tar.xz) = 8168916 diff --git a/lang/nim/files/patch-koch.nim b/lang/nim/files/patch-koch.nim index d6e6ef39e3b3..dec5e472402e 100644 --- a/lang/nim/files/patch-koch.nim +++ b/lang/nim/files/patch-koch.nim @@ -1,6 +1,6 @@ ---- koch.nim.orig 2025-02-06 01:49:40 UTC +--- koch.nim.orig 2025-05-07 14:07:39 UTC +++ koch.nim -@@ -150,31 +150,31 @@ proc csource(args: string) = +@@ -150,38 +150,38 @@ proc csource(args: string) = "--main:compiler/nim.nim compiler/installer.ini $1") % [args, VersionAsString, compileNimInst]) @@ -39,7 +39,7 @@ - cloneDependency(distDir, "https://github.com/nim-lang/atlas.git", - commit = commit, allowBundled = true) - cloneDependency(distDir / "atlas" / distDir, "https://github.com/nim-lang/sat.git", -- commit = SatStableCommit, allowBundled = true) +- commit = SatStableCommit, allowBundled = true) - # installer.ini expects it under $nim/bin - nimCompile("dist/atlas/src/atlas.nim", - options = "-d:release --noNimblePath -d:nimAtlasBootstrap " & args) @@ -48,23 +48,26 @@ +# cloneDependency(distDir, "https://github.com/nim-lang/atlas.git", +# commit = commit, allowBundled = true) +# cloneDependency(distDir / "atlas" / distDir, "https://github.com/nim-lang/sat.git", -+# commit = SatStableCommit, allowBundled = true) ++# commit = SatStableCommit, allowBundled = true) +# # installer.ini expects it under $nim/bin +# nimCompile("dist/atlas/src/atlas.nim", +# options = "-d:release --noNimblePath -d:nimAtlasBootstrap " & args) - proc bundleNimsuggest(args: string) = - nimCompileFold("Compile nimsuggest", "nimsuggest/nimsuggest.nim", -@@ -205,14 +205,14 @@ proc bundleWinTools(args: string) = - nimCompile(r"tools\downloader.nim", - options = r"--cc:vcc --app:gui -d:ssl --noNimblePath --path:..\ui " & args) - -proc bundleChecksums(latest: bool) = - let commit = if latest: "HEAD" else: ChecksumsStableCommit - cloneDependency(distDir, "https://github.com/nim-lang/checksums.git", commit, allowBundled = true) +#proc bundleChecksums(latest: bool) = +# let commit = if latest: "HEAD" else: ChecksumsStableCommit -+# cloneDependency(distDir, "https://github.com/nim-lang/checksums.git", commit, allowBundled = true) ++# cloneDependency(distDir, "https://github.com/nim-lang/checksums.git", commit, allowBundled #= true) + + proc bundleNimsuggest(args: string) = +- bundleChecksums(false) ++ #bundleChecksums(false) + nimCompileFold("Compile nimsuggest", "nimsuggest/nimsuggest.nim", + options = "-d:danger " & args) + +@@ -211,9 +211,9 @@ proc zip(latest: bool; args: string) = + options = r"--cc:vcc --app:gui -d:ssl --noNimblePath --path:..\ui " & args) proc zip(latest: bool; args: string) = - bundleChecksums(latest) @@ -76,7 +79,7 @@ bundleNimsuggest(args) bundleNimpretty(args) bundleWinTools(args) -@@ -221,15 +221,15 @@ proc zip(latest: bool; args: string) = +@@ -222,15 +222,15 @@ proc zip(latest: bool; args: string) = exec("$# --var:version=$# --var:mingw=none --main:compiler/nim.nim zip compiler/installer.ini" % ["tools/niminst/niminst".exe, VersionAsString]) @@ -99,7 +102,7 @@ nimexec("cc -r $2 --var:version=$1 --var:mingw=none --main:compiler/nim.nim scripts compiler/installer.ini" % [VersionAsString, compileNimInst]) exec("$# --var:version=$# --var:mingw=none --main:compiler/nim.nim xz compiler/installer.ini" % -@@ -264,9 +264,9 @@ proc nsis(latest: bool; args: string) = +@@ -265,9 +265,9 @@ proc nsis(latest: bool; args: string) = nimCompileFold("Compile testament", "testament/testament.nim", options = "-d:release " & args) proc nsis(latest: bool; args: string) = @@ -112,7 +115,7 @@ bundleNimsuggest(args) bundleWinTools(args) # make sure we have generated the niminst executables: -@@ -286,21 +286,21 @@ proc install(args: string) = +@@ -287,21 +287,21 @@ proc install(args: string) = geninstall() exec("sh ./install.sh $#" % args) @@ -149,7 +152,7 @@ # -------------- boot --------------------------------------------------------- -@@ -344,11 +344,11 @@ proc boot(args: string, skipIntegrityCheck: bool) = +@@ -345,11 +345,11 @@ proc boot(args: string, skipIntegrityCheck: bool) = let smartNimcache = (if "release" in args or "danger" in args: "nimcache/r_" else: "nimcache/d_") & hostOS & "_" & hostCPU @@ -164,7 +167,7 @@ let nimStart = findStartNim().quoteShell() let times = 2 - ord(skipIntegrityCheck) -@@ -507,7 +507,7 @@ proc temp(args: string) = +@@ -508,7 +508,7 @@ proc temp(args: string) = result[1].add " " & quoteShell(args[i]) inc i @@ -173,7 +176,7 @@ let d = getAppDir() let output = d / "compiler" / "nim".exe -@@ -551,27 +551,27 @@ proc icTest(args: string) = +@@ -552,27 +552,27 @@ proc icTest(args: string) = exec(cmd) inc i @@ -222,7 +225,7 @@ proc hostInfo(): string = -@@ -619,14 +619,14 @@ proc runCI(cmd: string) = +@@ -620,14 +620,14 @@ proc runCI(cmd: string) = # BUG: with initOptParser, `--batch:'' all` interprets `all` as the argument of --batch, pending bug #14343 execFold("Run tester", "nim c -r --putenv:NIM_TESTAMENT_REMOTE_NETWORKING:1 -d:nimStrictMode testament/testament $# all -d:nimCoroutines" % batchParam) @@ -245,7 +248,7 @@ execFold("Run nimdoc tests", "nim r nimdoc/tester") execFold("Run rst2html tests", "nim r nimdoc/rsttester") -@@ -698,18 +698,18 @@ proc showHelp(success: bool) = +@@ -699,18 +699,18 @@ proc showHelp(success: bool) = quit(HelpText % [VersionAsString & spaces(44-len(VersionAsString)), CompileDate, CompileTime], if success: QuitSuccess else: QuitFailure) @@ -271,7 +274,7 @@ localDocsOut = "" skipIntegrityCheck = false while true: -@@ -745,34 +745,34 @@ when isMainModule: +@@ -746,34 +746,34 @@ when isMainModule: of "distrohelper": geninstall() of "install": install(op.cmdLineRest) of "testinstall": testUnixInstall(op.cmdLineRest) diff --git a/lang/nim/files/patch-tools_deps.nim b/lang/nim/files/patch-tools_deps.nim index ab6d46bf2e34..fb942d0e5c83 100644 --- a/lang/nim/files/patch-tools_deps.nim +++ b/lang/nim/files/patch-tools_deps.nim @@ -1,6 +1,6 @@ ---- tools/deps.nim.orig 2025-02-06 01:49:40 UTC +--- tools/deps.nim.orig 2025-05-07 14:22:20 UTC +++ tools/deps.nim -@@ -20,28 +20,29 @@ proc cloneDependency*(destDirBase: string, url: string +@@ -22,30 +22,31 @@ proc cloneDependency*(destDirBase: string, url: string proc cloneDependency*(destDirBase: string, url: string, commit = commitHead, appendRepoName = true, allowBundled = false) = @@ -25,8 +25,10 @@ - let oldDir = getCurrentDir() - setCurrentDir(destDir) - try: -- execRetry "git fetch -q" -- exec fmt"git checkout -q {commit}" +- let checkoutCmd = fmt"git checkout -q {commit}" +- if tryexec(checkoutCmd) != 0: +- execRetry "git fetch -q" +- exec checkoutCmd - finally: - setCurrentDir(oldDir) - elif allowBundled: @@ -38,15 +40,17 @@ + # let oldDir = getCurrentDir() + # setCurrentDir(destDir) + # try: -+ # execRetry "git fetch -q" -+ # exec fmt"git checkout -q {commit}" ++ # let checkoutCmd = fmt"git checkout -q {commit}" ++ # if tryexec(checkoutCmd) != 0: ++ # execRetry "git fetch -q" ++ # exec checkoutCmd + # finally: + # setCurrentDir(oldDir) + #elif allowBundled: + # discard "this dependency was bundled with Nim, don't do anything" + #else: + # quit "FAILURE: " & destdir & " already exists but is not a git repo" -+ quit "FAILURE: git operations now allowed!: " & destDirBase ++ quit "FAILURE: git operations not allowed in ports!: " & destDirBase proc updateSubmodules*(dir: string, allowBundled = false) = if isGitRepo(dir): diff --git a/lang/njs/Makefile b/lang/njs/Makefile index fe7c619f091c..7f5291b3b1e8 100644 --- a/lang/njs/Makefile +++ b/lang/njs/Makefile @@ -1,5 +1,6 @@ PORTNAME= njs -DISTVERSION= 0.8.10 +DISTVERSION= 0.9.0 +PORTREVISION= 1 CATEGORIES= lang www MAINTAINER= osa@FreeBSD.org @@ -29,7 +30,7 @@ PLIST_FILES= bin/njs .include <bsd.port.pre.mk> # Fixes build failed for Clang 19.1.3+ -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1500026 && ${CHOSEN_COMPILER_TYPE} == clang +.if ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 191 CFLAGS+= -Wno-error=cast-function-type-mismatch .endif diff --git a/lang/njs/distinfo b/lang/njs/distinfo index 6caa8f3e5e60..fdd1988a13da 100644 --- a/lang/njs/distinfo +++ b/lang/njs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744849432 -SHA256 (nginx-njs-0.8.10_GH0.tar.gz) = 0be4bdd79184cd43f55a0377e59107fddfeef33e54f97c890894f0fe72628d26 -SIZE (nginx-njs-0.8.10_GH0.tar.gz) = 942446 +TIMESTAMP = 1746537031 +SHA256 (nginx-njs-0.9.0_GH0.tar.gz) = 7b0446f0b3e0b63b57883e0464d883f0ac4eab82ec7746599d37563dc6808203 +SIZE (nginx-njs-0.9.0_GH0.tar.gz) = 942562 diff --git a/lang/pharo/Makefile b/lang/pharo/Makefile index 837c5db14e2d..e9cbfdcde9bf 100644 --- a/lang/pharo/Makefile +++ b/lang/pharo/Makefile @@ -1,5 +1,6 @@ PORTNAME= pharo DISTVERSION= 10.2.0 +PORTREVISION= 1 DISTVERSIONSUFFIX= f4c5e2a CATEGORIES= lang MASTER_SITES= http://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/source/ diff --git a/lang/php83/Makefile b/lang/php83/Makefile index fc5ea93e6b25..a9fd3464ed9f 100644 --- a/lang/php83/Makefile +++ b/lang/php83/Makefile @@ -1,5 +1,5 @@ PORTNAME= php83 -DISTVERSION= 8.3.20 +DISTVERSION= 8.3.21 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions diff --git a/lang/php83/distinfo b/lang/php83/distinfo index 8543a593f499..023ca9ecb048 100644 --- a/lang/php83/distinfo +++ b/lang/php83/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744364022 -SHA256 (php-8.3.20.tar.xz) = f15914e071b5bddaf1475b5f2ba68107e8b8846655f9e89690fb7cd410b0db6c -SIZE (php-8.3.20.tar.xz) = 12549020 +TIMESTAMP = 1746776083 +SHA256 (php-8.3.21.tar.xz) = 4dfb329f209a552c3716394fc123bb62e80a468b55ce27fc8cb0fd5f30b9dcd6 +SIZE (php-8.3.21.tar.xz) = 12565664 diff --git a/lang/php84/Makefile b/lang/php84/Makefile index 3bcf556ab046..578bf8b52e08 100644 --- a/lang/php84/Makefile +++ b/lang/php84/Makefile @@ -1,5 +1,5 @@ PORTNAME= php84 -DISTVERSION= 8.4.6 +DISTVERSION= 8.4.7 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions diff --git a/lang/php84/distinfo b/lang/php84/distinfo index 424453e17be3..890dfd31f0c4 100644 --- a/lang/php84/distinfo +++ b/lang/php84/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744364047 -SHA256 (php-8.4.6.tar.xz) = 089b08a5efef02313483325f3bacd8c4fe311cf1e1e56749d5cc7d059e225631 -SIZE (php-8.4.6.tar.xz) = 13612892 +TIMESTAMP = 1746776098 +SHA256 (php-8.4.7.tar.xz) = e29f4c23be2816ed005aa3f06bbb8eae0f22cc133863862e893515fc841e65e3 +SIZE (php-8.4.7.tar.xz) = 13616620 diff --git a/lang/ruby32/Makefile b/lang/ruby32/Makefile index a1bcf3bf35e8..98d9a6445e70 100644 --- a/lang/ruby32/Makefile +++ b/lang/ruby32/Makefile @@ -14,6 +14,9 @@ LICENSE_COMB= dual LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/BSDL LICENSE_FILE_RUBY= ${WRKSRC}/COPYING +DEPRECATED= Please migrate to newer version. Ruby 3.2 is expected to reach its EoL on March 31, 2026 +EXPIRATION_DATE= 2026-04-30 + # Using LIB_DEPENDS finds the libffi from gcc which causes problems BUILD_DEPENDS= libffi>=0:devel/libffi LIB_DEPENDS= libyaml.so:textproc/libyaml diff --git a/lang/scala/Makefile b/lang/scala/Makefile index df83e6d9fcc2..ae92ff1c2ce3 100644 --- a/lang/scala/Makefile +++ b/lang/scala/Makefile @@ -1,7 +1,7 @@ PORTNAME= scala -DISTVERSION= 3.3.1 +DISTVERSION= 3.3.5 CATEGORIES= lang java -MASTER_SITES= https://github.com/lampepfl/dotty/releases/download/${DISTVERSION}/ +MASTER_SITES= https://github.com/scala/scala3/releases/download/${DISTVERSION}/ DISTNAME= scala3-${DISTVERSION} MAINTAINER= freebsd-ports@jan0sch.de diff --git a/lang/scala/distinfo b/lang/scala/distinfo index b819440cb907..1eeaa8e9c78b 100644 --- a/lang/scala/distinfo +++ b/lang/scala/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697615658 -SHA256 (scala3-3.3.1.tar.gz) = 11c0ea0f71c43af0fb1b355dde414bfef01a60c17293675e23a44d025269cd15 -SIZE (scala3-3.3.1.tar.gz) = 38427475 +TIMESTAMP = 1743085692 +SHA256 (scala3-3.3.5.tar.gz) = 255406d7a2f4ff745b6a125cf850f3ea96b34f26f9be7c6a3f8dbbda5d136a52 +SIZE (scala3-3.3.5.tar.gz) = 36566291 diff --git a/lang/solidity/Makefile b/lang/solidity/Makefile index 682189e3a31d..59c84e1dfdb9 100644 --- a/lang/solidity/Makefile +++ b/lang/solidity/Makefile @@ -1,5 +1,5 @@ PORTNAME= solidity -PORTVERSION= 0.8.27 +PORTVERSION= 0.8.30 CATEGORIES= lang MASTER_SITES= https://github.com/ethereum/solidity/releases/download/v${PORTVERSION}/ DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -23,18 +23,13 @@ CPE_VENDOR= ${PORTNAME}lang OPTIONS_DEFINE= Z3 CVC5 OPTIONS_DEFAULT=Z3 -OPTIONS_EXCLUDE_i386= Z3 Z3_DESC= SMT Checker via Z3 CVC5_DESC= SMT Checker via CVC5 -Z3_LIB_DEPENDS= libz3.so:math/z3 +Z3_RUN_DEPENDS= z3:math/z3 CVC5_RUN_DEPENDS= cvc5:math/cvc5 -Z3_CMAKE_OFF= USE_Z3 -CMAKE_ARGS+= -DUSE_LD_GOLD=OFF -DTESTS=OFF \ - -DIGNORE_VENDORED_DEPENDENCIES=ON \ - -DRANGE_V3_INCLUDE_DIR="${LOCALBASE}/include" \ - -DSTRICT_NLOHMANN_JSON_VERSION=OFF \ - -DSTRICT_Z3_VERSION=OFF +CMAKE_ARGS+= -DTESTS=OFF \ + -DIGNORE_VENDORED_DEPENDENCIES=ON PLIST_FILES= bin/solc \ bin/yul-phaser diff --git a/lang/solidity/distinfo b/lang/solidity/distinfo index ec2be3e84ea4..aca0f0d894e6 100644 --- a/lang/solidity/distinfo +++ b/lang/solidity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725531164 -SHA256 (solidity_0.8.27.tar.gz) = b015e05468f3da791c8b252eb201fa5cb1f62642d6285ed2a845b142f96fc8a6 -SIZE (solidity_0.8.27.tar.gz) = 12616162 +TIMESTAMP = 1746720051 +SHA256 (solidity_0.8.30.tar.gz) = 5e8d58dff551a18205e325c22f1a3b194058efbdc128853afd75d31b0568216d +SIZE (solidity_0.8.30.tar.gz) = 12807705 diff --git a/lang/solidity/files/patch-CMakeLists.txt b/lang/solidity/files/patch-CMakeLists.txt index b1905e3dd572..1d9953551df8 100644 --- a/lang/solidity/files/patch-CMakeLists.txt +++ b/lang/solidity/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ --- CMakeLists.txt.orig 2024-09-04 09:02:02 UTC +++ CMakeLists.txt -@@ -52,15 +52,21 @@ mark_as_advanced(ONLY_BUILD_SOLIDITY_LIBRARIES) +@@ -52,9 +52,6 @@ mark_as_advanced(ONLY_BUILD_SOLIDITY_LIBRARIES) mark_as_advanced(IGNORE_VENDORED_DEPENDENCIES) mark_as_advanced(ONLY_BUILD_SOLIDITY_LIBRARIES) @@ -10,18 +10,3 @@ # Let's find our dependencies include(EthDependencies) 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) diff --git a/lang/solidity/files/patch-libevmasm_Assembly.cpp b/lang/solidity/files/patch-libevmasm_Assembly.cpp index 21c549fb8adc..4a2ede8b79b0 100644 --- a/lang/solidity/files/patch-libevmasm_Assembly.cpp +++ b/lang/solidity/files/patch-libevmasm_Assembly.cpp @@ -1,6 +1,6 @@ ---- libevmasm/Assembly.cpp.orig 2024-05-21 09:44:13 UTC +--- libevmasm/Assembly.cpp.orig 2025-05-07 10:46:47 UTC +++ libevmasm/Assembly.cpp -@@ -54,6 +54,8 @@ std::map<std::string, std::shared_ptr<std::string cons +@@ -55,6 +55,8 @@ std::map<std::string, std::shared_ptr<std::string cons std::map<std::string, std::shared_ptr<std::string const>> Assembly::s_sharedSourceNames; diff --git a/lang/solidity/files/patch-libevmasm_Instruction.h b/lang/solidity/files/patch-libevmasm_Instruction.h index 36f47c312bee..3368d6e3f5df 100644 --- a/lang/solidity/files/patch-libevmasm_Instruction.h +++ b/lang/solidity/files/patch-libevmasm_Instruction.h @@ -1,8 +1,8 @@ ---- libevmasm/Instruction.h.orig 2023-07-19 09:24:46 UTC +--- libevmasm/Instruction.h.orig 2025-05-07 10:46:47 UTC +++ libevmasm/Instruction.h -@@ -27,6 +27,8 @@ - #include <libsolutil/Assertions.h> +@@ -28,6 +28,8 @@ #include <liblangutil/EVMVersion.h> + #include <liblangutil/Exceptions.h> +#undef MSIZE // remove MSIZE definition from <sys/params.h>, included by boost 1.66.0 + diff --git a/lang/solidity/files/patch-libyul_backends_evm_EVMDialect.cpp b/lang/solidity/files/patch-libyul_backends_evm_EVMDialect.cpp new file mode 100644 index 000000000000..5fc20b2ae032 --- /dev/null +++ b/lang/solidity/files/patch-libyul_backends_evm_EVMDialect.cpp @@ -0,0 +1,11 @@ +--- libyul/backends/evm/EVMDialect.cpp.orig 2025-05-08 16:10:03 UTC ++++ libyul/backends/evm/EVMDialect.cpp +@@ -56,6 +56,8 @@ std::tuple<size_t, size_t> constexpr verbatimIndexToAr + return std::make_tuple(_index - numRets * EVMDialect::verbatimMaxInputSlots, numRets); + } + ++#undef MSIZE // remove MSIZE definition from <sys/params.h>, included by boost 1.66.0 ++ + BuiltinFunctionForEVM createEVMFunction( + langutil::EVMVersion _evmVersion, + std::string const& _name, |