diff --git a/cad/nvc/Makefile b/cad/nvc/Makefile index 614134eb577c..1c164212bbe9 100644 --- a/cad/nvc/Makefile +++ b/cad/nvc/Makefile @@ -1,57 +1,56 @@ PORTNAME= nvc DISTVERSIONPREFIX= r -DISTVERSION= 1.7.0 +DISTVERSION= 1.7.0-23 +DISTVERSIONSUFFIX= -g265f2800 CATEGORIES= cad MAINTAINER= yuri@FreeBSD.org COMMENT= VHDL compiler and simulator LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_i386= compilation fails: Please port fill_cpu_state to this OS/CPU combination, see https://github.com/nickg/nvc/issues/501 - BUILD_DEPENDS= llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION} RUN_DEPENDS= llvm${LLVM_VERSION}>0:devel/llvm${LLVM_VERSION} \ bash:shells/bash TEST_DEPENDS= check>0:devel/check .if !exists(/usr/include/unwind.h) LIB_DEPENDS= libunwind.so:devel/libunwind .endif USES= autoreconf compiler:c++14-lang localbase pkgconfig shebangfix USE_GITHUB= yes GH_ACCOUNT= nickg SHEBANG_FILES= contrib/functions.sh GNU_CONFIGURE= yes LDFLAGS+= -lexecinfo CONFIGURE_ARGS= --with-llvm=${LOCALBASE}/bin/llvm-config${LLVM_VERSION} TEST_TARGET= check # one test fails MAKE_ARGS= CFLAGS="${CFLAGS}" # only for tests LLVM_VERSION= ${LLVM_DEFAULT} # outsource build is required by the project BUILD_DIR= ${WRKSRC}/.build BUILD_WRKSRC= ${BUILD_DIR} CONFIGURE_WRKSRC= ${BUILD_DIR} INSTALL_WRKSRC= ${BUILD_DIR} CONFIGURE_CMD= ${WRKSRC}/configure .include .if ${ARCH} == powerpc64 CONFIGURE_ARGS+= --enable-lto=no .endif post-install: @${FIND} ${STAGEDIR}${PREFIX} -name "*.so" | ${XARGS} ${STRIP_CMD} .include diff --git a/cad/nvc/distinfo b/cad/nvc/distinfo index b09db874a646..05d322c2156c 100644 --- a/cad/nvc/distinfo +++ b/cad/nvc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1659898552 -SHA256 (nickg-nvc-r1.7.0_GH0.tar.gz) = 5b9e75d61ae92e55904bf41910a35176564849be7f54e1cf85137ebe8522f758 -SIZE (nickg-nvc-r1.7.0_GH0.tar.gz) = 1284688 +TIMESTAMP = 1660206528 +SHA256 (nickg-nvc-r1.7.0-23-g265f2800_GH0.tar.gz) = 22225ebe955321a829b6bd0f492a644d09403e282aa5142ac29aaf2baf097524 +SIZE (nickg-nvc-r1.7.0-23-g265f2800_GH0.tar.gz) = 1284473 diff --git a/cad/nvc/files/patch-thirdparty_cpustate.c b/cad/nvc/files/patch-thirdparty_cpustate.c deleted file mode 100644 index f78ac6e70192..000000000000 --- a/cad/nvc/files/patch-thirdparty_cpustate.c +++ /dev/null @@ -1,16 +0,0 @@ ---- thirdparty/cpustate.c.orig 2022-08-10 16:48:11 UTC -+++ thirdparty/cpustate.c -@@ -103,6 +103,13 @@ void fill_cpu_state(struct cpu_state *cpu, ucontext_t - - for (int i = 0; i < 16; i++) - cpu->regs[i] = uc->uc_mcontext._gregs[i]; -+ -+#elif defined __FreeBSD__ && defined __powerpc__ -+ cpu->pc = uc->uc_mcontext.mc_srr0; -+ cpu->sp = uc->uc_mcontext.mc_gpr[1]; -+ -+ for (int i = 0; i < 32; i++) -+ cpu->regs[i] = uc->uc_mcontext.mc_gpr[i]; - #elif defined __OpenBSD__ && defined __x86_64__ - cpu->pc = uc->sc_rip; - cpu->sp = uc->sc_rsp; diff --git a/cad/nvc/pkg-plist b/cad/nvc/pkg-plist index 60eeeb8b8527..45f706c84b5d 100644 --- a/cad/nvc/pkg-plist +++ b/cad/nvc/pkg-plist @@ -1,98 +1,137 @@ bin/nvc include/vhpi_user.h lib/nvc/ieee.08/IEEE.FIXED_FLOAT_TYPES lib/nvc/ieee.08/IEEE.FIXED_GENERIC_PKG lib/nvc/ieee.08/IEEE.FIXED_GENERIC_PKG-body lib/nvc/ieee.08/IEEE.FIXED_PKG lib/nvc/ieee.08/IEEE.FLOAT_GENERIC_PKG lib/nvc/ieee.08/IEEE.FLOAT_GENERIC_PKG-body lib/nvc/ieee.08/IEEE.FLOAT_PKG lib/nvc/ieee.08/IEEE.IEEE_BIT_CONTEXT lib/nvc/ieee.08/IEEE.IEEE_STD_CONTEXT lib/nvc/ieee.08/IEEE.MATH_COMPLEX lib/nvc/ieee.08/IEEE.MATH_COMPLEX-body lib/nvc/ieee.08/IEEE.MATH_REAL lib/nvc/ieee.08/IEEE.MATH_REAL-body lib/nvc/ieee.08/IEEE.NUMERIC_BIT lib/nvc/ieee.08/IEEE.NUMERIC_BIT-body lib/nvc/ieee.08/IEEE.NUMERIC_BIT_UNSIGNED lib/nvc/ieee.08/IEEE.NUMERIC_BIT_UNSIGNED-body lib/nvc/ieee.08/IEEE.NUMERIC_STD lib/nvc/ieee.08/IEEE.NUMERIC_STD-body lib/nvc/ieee.08/IEEE.NUMERIC_STD_UNSIGNED lib/nvc/ieee.08/IEEE.NUMERIC_STD_UNSIGNED-body lib/nvc/ieee.08/IEEE.STD_LOGIC_1164 lib/nvc/ieee.08/IEEE.STD_LOGIC_1164-body lib/nvc/ieee.08/IEEE.STD_LOGIC_ARITH lib/nvc/ieee.08/IEEE.STD_LOGIC_ARITH-body lib/nvc/ieee.08/IEEE.STD_LOGIC_SIGNED lib/nvc/ieee.08/IEEE.STD_LOGIC_SIGNED-body lib/nvc/ieee.08/IEEE.STD_LOGIC_TEXTIO lib/nvc/ieee.08/IEEE.STD_LOGIC_UNSIGNED lib/nvc/ieee.08/IEEE.STD_LOGIC_UNSIGNED-body lib/nvc/ieee.08/IEEE.VITAL_MEMORY lib/nvc/ieee.08/IEEE.VITAL_MEMORY-body lib/nvc/ieee.08/IEEE.VITAL_PRIMITIVES lib/nvc/ieee.08/IEEE.VITAL_PRIMITIVES-body lib/nvc/ieee.08/IEEE.VITAL_TIMING lib/nvc/ieee.08/IEEE.VITAL_TIMING-body lib/nvc/ieee.08/_NVC_LIB lib/nvc/ieee.08/_index +lib/nvc/ieee.19/IEEE.FIXED_FLOAT_TYPES +lib/nvc/ieee.19/IEEE.FIXED_GENERIC_PKG +lib/nvc/ieee.19/IEEE.FIXED_GENERIC_PKG-body +lib/nvc/ieee.19/IEEE.FIXED_PKG +lib/nvc/ieee.19/IEEE.FLOAT_GENERIC_PKG +lib/nvc/ieee.19/IEEE.FLOAT_GENERIC_PKG-body +lib/nvc/ieee.19/IEEE.FLOAT_PKG +lib/nvc/ieee.19/IEEE.IEEE_BIT_CONTEXT +lib/nvc/ieee.19/IEEE.IEEE_STD_CONTEXT +lib/nvc/ieee.19/IEEE.MATH_COMPLEX +lib/nvc/ieee.19/IEEE.MATH_COMPLEX-body +lib/nvc/ieee.19/IEEE.MATH_REAL +lib/nvc/ieee.19/IEEE.MATH_REAL-body +lib/nvc/ieee.19/IEEE.NUMERIC_BIT +lib/nvc/ieee.19/IEEE.NUMERIC_BIT-body +lib/nvc/ieee.19/IEEE.NUMERIC_BIT_UNSIGNED +lib/nvc/ieee.19/IEEE.NUMERIC_BIT_UNSIGNED-body +lib/nvc/ieee.19/IEEE.NUMERIC_STD +lib/nvc/ieee.19/IEEE.NUMERIC_STD-body +lib/nvc/ieee.19/IEEE.NUMERIC_STD_UNSIGNED +lib/nvc/ieee.19/IEEE.NUMERIC_STD_UNSIGNED-body +lib/nvc/ieee.19/IEEE.STD_LOGIC_1164 +lib/nvc/ieee.19/IEEE.STD_LOGIC_1164-body +lib/nvc/ieee.19/IEEE.STD_LOGIC_TEXTIO +lib/nvc/ieee.19/_NVC_LIB +lib/nvc/ieee.19/_index lib/nvc/ieee/IEEE.MATH_COMPLEX lib/nvc/ieee/IEEE.MATH_COMPLEX-body lib/nvc/ieee/IEEE.MATH_REAL lib/nvc/ieee/IEEE.MATH_REAL-body lib/nvc/ieee/IEEE.NUMERIC_BIT lib/nvc/ieee/IEEE.NUMERIC_BIT-body lib/nvc/ieee/IEEE.NUMERIC_STD lib/nvc/ieee/IEEE.NUMERIC_STD-body lib/nvc/ieee/IEEE.STD_LOGIC_1164 lib/nvc/ieee/IEEE.STD_LOGIC_1164-body lib/nvc/ieee/IEEE.STD_LOGIC_ARITH lib/nvc/ieee/IEEE.STD_LOGIC_ARITH-body lib/nvc/ieee/IEEE.STD_LOGIC_MISC lib/nvc/ieee/IEEE.STD_LOGIC_MISC-body lib/nvc/ieee/IEEE.STD_LOGIC_SIGNED lib/nvc/ieee/IEEE.STD_LOGIC_SIGNED-body lib/nvc/ieee/IEEE.STD_LOGIC_TEXTIO lib/nvc/ieee/IEEE.STD_LOGIC_TEXTIO-body lib/nvc/ieee/IEEE.STD_LOGIC_UNSIGNED lib/nvc/ieee/IEEE.STD_LOGIC_UNSIGNED-body lib/nvc/ieee/IEEE.VITAL_MEMORY lib/nvc/ieee/IEEE.VITAL_MEMORY-body lib/nvc/ieee/IEEE.VITAL_PRIMITIVES lib/nvc/ieee/IEEE.VITAL_PRIMITIVES-body lib/nvc/ieee/IEEE.VITAL_TIMING lib/nvc/ieee/IEEE.VITAL_TIMING-body lib/nvc/ieee/_NVC_LIB lib/nvc/ieee/_index lib/nvc/nvc.08/NVC.IEEE_SUPPORT lib/nvc/nvc.08/NVC.IEEE_SUPPORT-body lib/nvc/nvc.08/NVC.POLYFILL lib/nvc/nvc.08/NVC.SIM_PKG lib/nvc/nvc.08/_NVC_LIB lib/nvc/nvc.08/_index +lib/nvc/nvc.19/NVC.IEEE_SUPPORT +lib/nvc/nvc.19/NVC.IEEE_SUPPORT-body +lib/nvc/nvc.19/NVC.POLYFILL +lib/nvc/nvc.19/NVC.SIM_PKG +lib/nvc/nvc.19/_NVC_LIB +lib/nvc/nvc.19/_index lib/nvc/nvc/NVC.POLYFILL lib/nvc/nvc/NVC.POLYFILL-body lib/nvc/nvc/NVC.SIM_PKG lib/nvc/nvc/_NVC_LIB lib/nvc/nvc/_index lib/nvc/std.08/STD.ENV lib/nvc/std.08/STD.ENV-body lib/nvc/std.08/STD.STANDARD lib/nvc/std.08/STD.TEXTIO lib/nvc/std.08/STD.TEXTIO-body lib/nvc/std.08/_NVC_LIB lib/nvc/std.08/_index +lib/nvc/std.19/STD.ENV +lib/nvc/std.19/STD.ENV-body +lib/nvc/std.19/STD.STANDARD +lib/nvc/std.19/STD.TEXTIO +lib/nvc/std.19/STD.TEXTIO-body +lib/nvc/std.19/_NVC_LIB +lib/nvc/std.19/_index lib/nvc/std/STD.STANDARD lib/nvc/std/STD.TEXTIO lib/nvc/std/STD.TEXTIO-body lib/nvc/std/_NVC_LIB lib/nvc/std/_index lib/nvc/synopsys/SYNOPSYS.ATTRIBUTES lib/nvc/synopsys/_NVC_LIB lib/nvc/synopsys/_index libexec/nvc/functions.sh libexec/nvc/install-osvvm.sh libexec/nvc/install-uvvm.sh man/man1/nvc.1.gz