From nobody Thu Jan 9 12:22:12 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YTP6r44l5z5kjb1; Thu, 09 Jan 2025 12:22:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YTP6r22x5z4rh1; Thu, 9 Jan 2025 12:22:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736425332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IIF5gnU80wHkVrkfayDpeUWns4SRCFyOlIOn1zAfmKw=; b=oy4vGyU5vxvKeOewyXFiE2dXYmwc68R6buN0B3osfzNfcYtwwdyjNWtWRRmv+DA7uqv4kO 5yDGrmE+Pu3wtzNMRccyoQJrQJiHdkJy7jCoJRKJmcjt3VSNrRhOTqM4qNvr6xy4HD5zvC Qgh3xjF39l+lGnQ07VSO0a3KzJOe0rG0Iw8+G8a+8lj39ySO5JRxqj4Kz1rPMS5fhSKyWK 5YTUqT9r2FQt7OuILfSW5etUj2vPoXg0BtSMljD6gya/bYuFDD5Jp1qQNiNyUZDcVu/o6+ mqVIfgKWeEyEdpsaiHXmM4nY6nhJHaZccR+Jtacoe3fS3EpFuMZvCzCHYD1e0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736425332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IIF5gnU80wHkVrkfayDpeUWns4SRCFyOlIOn1zAfmKw=; b=oKFlDCep7AxOKhupKMMmRygaSu6pzHXcrzaEz0XIpBH8B1uKjYUCHOWi6TL4OH8jWR7dbg g0GhOoG1G0zMWZAJtFEx59X+3mx5ZIbrPR89dTcfLOYi5+2cp/RRFqO0gN6ITIqumz70zT G+4qDLiUanQ5+p5WWXF+4ow1YBw1tbszYIPLcu78MM6F4/14YhPEiY71GC6QluJ2FZK1XL /MuN3Sw2K+RNPDnlUkJ66wX0OGZm9i3/SYFCQ8hnejpp0CJR+BquToxWzlBoS+zZQ2ql/J kv6CfahCAsidurX54lWl3Q4+d2eR4a5xibjhGzKibt+5wYtcth3ntT2dCIHg6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736425332; a=rsa-sha256; cv=none; b=VIwJi7ulWQc6fmaSp9mF0gv2Rjp62aueem0UjWkG1xrpnEjZpuBLOOrl4Hln/tV+6Mk7+C 5HM5keiBnBPUP37Thdl5s5RGeqfiBp2PS3tQPh6tlT5Sb6NuEBnDbD+LyYijUZGw/0IVkg y7gcZ6wlpKXWgqjhvlQdEe3RAykRI+T0wyArpcEwo3KUn0z971imwzDCFGDcYsQVuOg6EJ 4+ewcXe6bw2h2MObggRPnHqPKXDBhSMFkXuFOk9r7yqaGHfdfOS4Y1Vhn57IwFf5LsD6xW Ykf2NtWpU3IUKcriuA1UeBjAoLXE4RuCpe7JoFNJYIlWJePMnF54xF7F0NQu1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YTP6r1W2pzB2Q; Thu, 09 Jan 2025 12:22:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 509CMC2m064715; Thu, 9 Jan 2025 12:22:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 509CMC2Z064712; Thu, 9 Jan 2025 12:22:12 GMT (envelope-from git) Date: Thu, 9 Jan 2025 12:22:12 GMT Message-Id: <202501091222.509CMC2Z064712@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: dcb7376d0007 - main - devel/ikos: update 3.2 =?utf-8?Q?=E2=86=92?= 3.5 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dcb7376d000787b73be2172b761a57308be3bfc3 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=dcb7376d000787b73be2172b761a57308be3bfc3 commit dcb7376d000787b73be2172b761a57308be3bfc3 Author: Yuri Victorovich AuthorDate: 2025-01-09 12:21:56 +0000 Commit: Yuri Victorovich CommitDate: 2025-01-09 12:22:08 +0000 devel/ikos: update 3.2 → 3.5 Reported by: portscout --- devel/ikos/Makefile | 18 +++++++++++++--- devel/ikos/distinfo | 6 +++--- .../files/patch-analyzer_python_ikos_analyzer.py | 12 +++++------ devel/ikos/files/patch-analyzer_script_ikos.py.in | 12 +++++++++++ devel/ikos/files/patch-ar_src_format_text.cpp | 13 ++++++++++++ devel/ikos/pkg-plist | 24 ++++++++++++++++++++++ 6 files changed, 73 insertions(+), 12 deletions(-) diff --git a/devel/ikos/Makefile b/devel/ikos/Makefile index 1dfea014dc2f..fa5c1c3ae66d 100644 --- a/devel/ikos/Makefile +++ b/devel/ikos/Makefile @@ -1,7 +1,6 @@ PORTNAME= ikos DISTVERSIONPREFIX= v -DISTVERSION= 3.2 -PORTREVISION= 5 +DISTVERSION= 3.5 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org @@ -32,14 +31,27 @@ LLVM_VERSION= 14 # only llvm-14 is currently supported CXXFLAGS+= -DNDEBUG # https://github.com/NASA-SW-VnV/ikos/issues/36, it also breaks with assert without NDEBUG CMAKE_ON= BUILD_SHARED_LIBS +CMAKE_OFF= INSTALL_PYTHON_VIRTUALENV CMAKE_ARGS= -DLLVM_CONFIG_EXECUTABLE:PATH=${LOCALBASE}/bin/llvm-config${LLVM_VERSION} \ - -DPYTHON_EXECUTABLE:STRING=${PYTHON_CMD} + -DPYTHON_EXECUTABLE:STRING=${PYTHON_CMD} \ + -DPYTHON_VENV_EXECUTABLE:STRING=${PYTHON_CMD} PLIST_SUB= PORTVERSION=${PORTVERSION} post-configure: # workaround for the problem that --color-diagnostics gets into the linker command lines @${REINPLACE_CMD} 's|-Wl,--color-diagnostics| |' ${BUILD_WRKSRC}/build.ninja +post-install: + # install the local python module 'ikos' + @${MKDIR} ${STAGEDIR}${DATADIR}/python + cd ${BUILD_WRKSRC}/analyzer/python && \ + ${COPYTREE_SHARE} ikos ${STAGEDIR}${DATADIR}/python + ${CP} ${WRKSRC}/analyzer/python/ikos/*.py ${STAGEDIR}${DATADIR}/python/ikos + cd ${WRKSRC}/analyzer/python/ikos && \ + ${COPYTREE_SHARE} view ${STAGEDIR}${DATADIR}/python/ikos + # expand the token + ${REINPLACE_CMD} -i '' -e 's|%%PREFIX%%|${PREFIX}|' ${STAGEDIR}${PREFIX}/bin/ikos + # use clang corresponding to the used llvm version CPP= clang-cpp${LLVM_VERSION} CC= clang${LLVM_VERSION} diff --git a/devel/ikos/distinfo b/devel/ikos/distinfo index 38a6b6e44ddd..5e5d05f8f4f8 100644 --- a/devel/ikos/distinfo +++ b/devel/ikos/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1703825428 -SHA256 (NASA-SW-VnV-ikos-v3.2_GH0.tar.gz) = 11ab520043523a048f8756d68bd3f6a761870d4ec1a9f240eda8f3b1a11f7aa1 -SIZE (NASA-SW-VnV-ikos-v3.2_GH0.tar.gz) = 1381841 +TIMESTAMP = 1736373858 +SHA256 (NASA-SW-VnV-ikos-v3.5_GH0.tar.gz) = 375b575b715901f47d7884e8ac33e5c4410974011b603f825c5e6eda7d1c74b8 +SIZE (NASA-SW-VnV-ikos-v3.5_GH0.tar.gz) = 1382417 diff --git a/devel/ikos/files/patch-analyzer_python_ikos_analyzer.py b/devel/ikos/files/patch-analyzer_python_ikos_analyzer.py index 6c98135fc18c..a495f7c9bde5 100644 --- a/devel/ikos/files/patch-analyzer_python_ikos_analyzer.py +++ b/devel/ikos/files/patch-analyzer_python_ikos_analyzer.py @@ -1,8 +1,8 @@ ---- analyzer/python/ikos/analyzer.py.orig 2018-12-14 07:13:50 UTC +--- analyzer/python/ikos/analyzer.py.orig 2024-12-31 23:34:34 UTC +++ analyzer/python/ikos/analyzer.py -@@ -554,10 +554,10 @@ def clang(bc_path, cpp_path, colors=True - # For #include - cmd += ['-isystem', settings.INCLUDE_DIR] +@@ -703,10 +703,10 @@ def clang( + if machine_flags: + cmd += ['-m%s' % m for m in machine_flags] - if colors: - cmd.append('-fcolor-diagnostics') @@ -13,5 +13,5 @@ + #else: + # cmd.append('-fno-color-diagnostics') - if cpp_path.endswith('.cpp'): - cmd.append('-std=c++14') # available because clang >= 4.0 + if path_ext(cpp_path) in cpp_extensions: + cmd.append('-std=c++17') # available because clang >= 7.0 diff --git a/devel/ikos/files/patch-analyzer_script_ikos.py.in b/devel/ikos/files/patch-analyzer_script_ikos.py.in new file mode 100644 index 000000000000..0745d41049e7 --- /dev/null +++ b/devel/ikos/files/patch-analyzer_script_ikos.py.in @@ -0,0 +1,12 @@ +--- analyzer/script/ikos.py.in.orig 2025-01-09 06:36:15 UTC ++++ analyzer/script/ikos.py.in +@@ -43,6 +43,9 @@ import sys + import os.path + import sys + ++# add local python module to sys.path ++sys.path.append('%%PREFIX%%/share/ikos/python') ++ + if __name__ == '__main__': + try: + import ikos.analyzer diff --git a/devel/ikos/files/patch-ar_src_format_text.cpp b/devel/ikos/files/patch-ar_src_format_text.cpp new file mode 100644 index 000000000000..4473b6a2243a --- /dev/null +++ b/devel/ikos/files/patch-ar_src_format_text.cpp @@ -0,0 +1,13 @@ +- workaround the potential problem in boost: /usr/local/include/boost/move/adl_move_swap.hpp:190:15: error: no member named 'swap' in namespace 'std' + +--- ar/src/format/text.cpp.orig 2025-01-08 22:27:38 UTC ++++ ar/src/format/text.cpp +@@ -41,6 +41,8 @@ + * + ******************************************************************************/ + ++#include ++ + #include + + #include diff --git a/devel/ikos/pkg-plist b/devel/ikos/pkg-plist index 735129ebe113..1d163f3af5d9 100644 --- a/devel/ikos/pkg-plist +++ b/devel/ikos/pkg-plist @@ -165,6 +165,30 @@ include/ikos/frontend/llvm/pass.hpp lib/libikos-ar.so lib/libikos-llvm-to-ar.so lib/libikos-pp.so +%%DATADIR%%/python/ikos/__init__.py +%%DATADIR%%/python/ikos/abs_int.py +%%DATADIR%%/python/ikos/analyzer.py +%%DATADIR%%/python/ikos/args.py +%%DATADIR%%/python/ikos/colors.py +%%DATADIR%%/python/ikos/enums.py +%%DATADIR%%/python/ikos/filetype.py +%%DATADIR%%/python/ikos/highlight.py +%%DATADIR%%/python/ikos/http.py +%%DATADIR%%/python/ikos/log.py +%%DATADIR%%/python/ikos/output_db.py +%%DATADIR%%/python/ikos/report.py +%%DATADIR%%/python/ikos/scan.py +%%DATADIR%%/python/ikos/settings/__init__.py +%%DATADIR%%/python/ikos/stats.py +%%DATADIR%%/python/ikos/view.py +%%DATADIR%%/python/ikos/view/static/css/ikos_theme.css +%%DATADIR%%/python/ikos/view/static/js/ikos_homepage.js +%%DATADIR%%/python/ikos/view/static/js/ikos_report.js +%%DATADIR%%/python/ikos/view/template/error.html +%%DATADIR%%/python/ikos/view/template/homepage.html +%%DATADIR%%/python/ikos/view/template/not_found.html +%%DATADIR%%/python/ikos/view/template/report.html +%%DATADIR%%/python/ikos/view/template/settings.html %%DATADIR%%/view/static/css/ikos_theme.css %%DATADIR%%/view/static/js/ikos_homepage.js %%DATADIR%%/view/static/js/ikos_report.js