git: a5d441ef34b4 - main - cad/surelog: Update 0.0.3924 .> 0.0.3950

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Sat, 01 Jan 2022 23:04:02 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a5d441ef34b4456442028ca55777b9c64fd6314d

commit a5d441ef34b4456442028ca55777b9c64fd6314d
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-01-01 23:02:53 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-01-01 23:03:59 +0000

    cad/surelog: Update 0.0.3924 .> 0.0.3950
---
 cad/surelog/Makefile                   | 19 ++++++++++++++-----
 cad/surelog/distinfo                   | 10 +++++-----
 cad/surelog/files/patch-CMakeLists.txt | 11 +++++++++++
 cad/surelog/pkg-plist                  |  6 ++++--
 4 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/cad/surelog/Makefile b/cad/surelog/Makefile
index 6b3b611f7988..7c740fff0d7d 100644
--- a/cad/surelog/Makefile
+++ b/cad/surelog/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	surelog
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0-3924
-DISTVERSIONSUFFIX=	-g53d571844
+DISTVERSION=	0.0-3950
+DISTVERSIONSUFFIX=	-g88ae53316
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -10,10 +10,11 @@ COMMENT=	SystemVerilog 2017 Pre-processor, Parser, Elaborator, etc
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	utf8cpp>0:devel/utf8cpp
+BUILD_DEPENDS=	utf8cpp>0:devel/utf8cpp \
+		${PYTHON_PKGNAMEPREFIX}orderedmultidict>0:devel/py-orderedmultidict@${PY_FLAVOR}
 LIB_DEPENDS=	libtcmalloc.so:devel/google-perftools
 
-USES=		cmake compiler:c++17-lang localbase:ldflags python:build tcl:86,build
+USES=		cmake compiler:c++17-lang localbase:ldflags tcl:86,build
 USE_JAVA=	yes
 USE_LDCONFIG=	yes
 
@@ -22,7 +23,7 @@ GH_ACCOUNT=	chipsalliance
 GH_PROJECT=	Surelog
 GH_TUPLE=	\
 		alainmarcel:antlr4:18ca2ee:antlr4/third_party/antlr4 \
-		chipsalliance:UHDM:a8be019:UHDM/third_party/UHDM \
+		chipsalliance:UHDM:5a72785:UHDM/third_party/UHDM \
 		capnproto:capnproto:14f24a4:UHDM_capnproto/third_party/UHDM/third_party/capnproto \
 		google:googletest:1b18723:googletest/third_party/googletest \
 		google:flatbuffers:f28c2b2:flatbuffers/third_party/flatbuffers
@@ -31,4 +32,12 @@ CMAKE_ON=	BUILD_SHARED_LIBS
 
 BINARY_ALIAS=	python3=${PYTHON_CMD} tclsh=${TCLSH}
 
+OPTIONS_DEFINE=	PYTHON
+
+PYTHON_USES=		python
+PYTHON_USES_OFF=	python:build
+PYTHON_CMAKE_BOOL=	SURELOG_WITH_PYTHON
+PYTHON_CMAKE_ON=	-DFREEBSD_PYTHON_DISTVERSION=${PYTHON_DISTVERSION}
+PYTHON_BROKEN=		see https://github.com/chipsalliance/Surelog/issues/2373
+
 .include <bsd.port.mk>
diff --git a/cad/surelog/distinfo b/cad/surelog/distinfo
index cfc885b01c08..d96884f6f26c 100644
--- a/cad/surelog/distinfo
+++ b/cad/surelog/distinfo
@@ -1,10 +1,10 @@
-TIMESTAMP = 1640583362
-SHA256 (chipsalliance-Surelog-v0.0-3924-g53d571844_GH0.tar.gz) = 17d22630977055af40ba6b02da4c6d7821ff9533b4250bdebba8f1bb49070419
-SIZE (chipsalliance-Surelog-v0.0-3924-g53d571844_GH0.tar.gz) = 86506853
+TIMESTAMP = 1641067303
+SHA256 (chipsalliance-Surelog-v0.0-3950-g88ae53316_GH0.tar.gz) = d8c9147c0072b965440393e5ced925a51f897d99bf23e63d33cf368f7f1e68e1
+SIZE (chipsalliance-Surelog-v0.0-3950-g88ae53316_GH0.tar.gz) = 86771635
 SHA256 (alainmarcel-antlr4-18ca2ee_GH0.tar.gz) = 77f1b3586e29b773f84adc6ef000a015fc3eec9c2af6008b087e55a494cdfd45
 SIZE (alainmarcel-antlr4-18ca2ee_GH0.tar.gz) = 6777084
-SHA256 (chipsalliance-UHDM-a8be019_GH0.tar.gz) = 9843aabb5488e62e350033b355997e42b2514a431377a7650ef6c55fc48791e0
-SIZE (chipsalliance-UHDM-a8be019_GH0.tar.gz) = 1700368
+SHA256 (chipsalliance-UHDM-5a72785_GH0.tar.gz) = 07f86d1fb8fb6244e6c2ff21289c9ba3b9ecdec867c7d03b2176e6bb726aa951
+SIZE (chipsalliance-UHDM-5a72785_GH0.tar.gz) = 1699532
 SHA256 (capnproto-capnproto-14f24a4_GH0.tar.gz) = 1130e78658e8b1ceb3a69a6b3a964913f22505532ab217299e5600f371922877
 SIZE (capnproto-capnproto-14f24a4_GH0.tar.gz) = 2121570
 SHA256 (google-googletest-1b18723_GH0.tar.gz) = c51c5ce6577f1e2972e53ddb7df4e072c8e4091090d281a7eb753717e545c0b1
diff --git a/cad/surelog/files/patch-CMakeLists.txt b/cad/surelog/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..a9d1360b00b2
--- /dev/null
+++ b/cad/surelog/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2022-01-01 21:16:17 UTC
++++ CMakeLists.txt
+@@ -45,7 +45,7 @@ set(GENDIR ${CMAKE_CURRENT_BINARY_DIR}/generated)
+ 
+ # Python
+ if (SURELOG_WITH_PYTHON)
+-  find_package(Python3 3.3 REQUIRED COMPONENTS Interpreter Development)
++  find_package(Python3 ${FREEBSD_PYTHON_DISTVERSION} EXACT REQUIRED COMPONENTS Interpreter Development)
+   find_package(SWIG 3.0 REQUIRED)
+   message(STATUS "Python3_LIBRARIES = ${Python3_LIBRARIES}")
+   message(STATUS "Python3_EXECUTABLE = ${Python3_EXECUTABLE}")
diff --git a/cad/surelog/pkg-plist b/cad/surelog/pkg-plist
index 4d4a8e47eb63..0d1b2e6120be 100644
--- a/cad/surelog/pkg-plist
+++ b/cad/surelog/pkg-plist
@@ -76,6 +76,7 @@ include/uhdm/RTTI.h
 include/uhdm/Serializer.h
 include/uhdm/SymbolFactory.h
 include/uhdm/VpiListener.h
+include/uhdm/VpiListenerTracer.h
 include/uhdm/actual_group.h
 include/uhdm/alias_stmt.h
 include/uhdm/always.h
@@ -108,6 +109,7 @@ include/uhdm/checker_inst.h
 include/uhdm/checker_inst_port.h
 include/uhdm/checker_port.h
 include/uhdm/class_defn.h
+include/uhdm/class_hierarchy.txt
 include/uhdm/class_obj.h
 include/uhdm/class_typespec.h
 include/uhdm/class_var.h
@@ -351,6 +353,7 @@ lib/libcapnp.so
 lib/libcapnp.so.0.8.0
 lib/libkj.so
 lib/libkj.so.0.8.0
+lib/libuhdm.so
 lib/surelog/libantlr4-runtime.a
 lib/surelog/libflatbuffers.a
 lib/surelog/libsurelog.a
@@ -358,7 +361,6 @@ lib/surelog/pkg/work/ovm_pkg.sv.slpa
 lib/surelog/pkg/work/ovm_pkg.sv.slpp
 lib/surelog/pkg/work/uvm_pkg.sv.slpa
 lib/surelog/pkg/work/uvm_pkg.sv.slpp
-lib/surelog/sv/builtin.sv
 lib/uhdm/UHDM.capnp
-lib/uhdm/libuhdm.a
 @dir lib/surelog/python
+@dir lib/surelog/sv