diff options
author | Yuri Victorovich <yuri@FreeBSD.org> | 2021-02-04 01:01:48 +0000 |
---|---|---|
committer | Yuri Victorovich <yuri@FreeBSD.org> | 2021-02-04 01:01:48 +0000 |
commit | 53bafecbf0b23b0ca85db504021a0d293fe9bf98 (patch) | |
tree | 793758f4256a8f43bb6c36a10f1e4c6627550ce8 | |
parent | net/py-zeroconf: update to version 0.28.8 (diff) |
cad/ghdl: Update 0.37 -> 1.0.0
Reported by: portscout
-rw-r--r-- | cad/ghdl/Makefile | 9 | ||||
-rw-r--r-- | cad/ghdl/distinfo | 8 | ||||
-rw-r--r-- | cad/ghdl/files/patch-src_ghdldrv_ghdldrv.adb | 23 | ||||
-rw-r--r-- | cad/ghdl/files/patch-testsuite_testsuite.sh | 11 | ||||
-rw-r--r-- | cad/ghdl/pkg-plist | 126 |
5 files changed, 61 insertions, 116 deletions
diff --git a/cad/ghdl/Makefile b/cad/ghdl/Makefile index 8676b4d96fbc..e2a42a274110 100644 --- a/cad/ghdl/Makefile +++ b/cad/ghdl/Makefile @@ -3,9 +3,12 @@ PORTNAME= ghdl DISTVERSIONPREFIX= v -DISTVERSION= 0.37 +DISTVERSION= 1.0.0 CATEGORIES= cad +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ +PATCHFILES= 38025814efbba57d7527f37b16847b114815ab62.patch:-p1 # fixes https://github.com/ghdl/ghdl/issues/1627 + MAINTAINER= yuri@FreeBSD.org COMMENT= GNU VHDL simulator @@ -15,10 +18,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING.md LIB_DEPENDS= libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libmpc.so:math/mpc +TEST_DEPENDS= bash:shells/bash USES= ada:run gmake shebangfix -SHEBANG_FILES= libraries/vendors/config.sh -SHEBANG_GLOB= testsuite.sh +SHEBANG_FILES= testsuite/testsuite.sh USE_GITHUB= yes USE_LDCONFIG= yes diff --git a/cad/ghdl/distinfo b/cad/ghdl/distinfo index 0afea756759a..c18872875e52 100644 --- a/cad/ghdl/distinfo +++ b/cad/ghdl/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1583007930 -SHA256 (ghdl-ghdl-v0.37_GH0.tar.gz) = 3008616201cc3b0b596872e4ad59d8bc36e6ee3ff798bdce066828fbdad041e4 -SIZE (ghdl-ghdl-v0.37_GH0.tar.gz) = 4770478 +TIMESTAMP = 1612392740 +SHA256 (ghdl-ghdl-v1.0.0_GH0.tar.gz) = cb424766fbe831ff41bec84016a6af0406d735c272b0b639d507c3503df30495 +SIZE (ghdl-ghdl-v1.0.0_GH0.tar.gz) = 6232006 +SHA256 (38025814efbba57d7527f37b16847b114815ab62.patch) = 0e344cc497107a73f65449563f819d2e3077cac7fb31737c0c4e5d988dadebc7 +SIZE (38025814efbba57d7527f37b16847b114815ab62.patch) = 771 diff --git a/cad/ghdl/files/patch-src_ghdldrv_ghdldrv.adb b/cad/ghdl/files/patch-src_ghdldrv_ghdldrv.adb index 472221455770..f0580665f79d 100644 --- a/cad/ghdl/files/patch-src_ghdldrv_ghdldrv.adb +++ b/cad/ghdl/files/patch-src_ghdldrv_ghdldrv.adb @@ -1,11 +1,22 @@ ---- src/ghdldrv/ghdldrv.adb.orig 2019-10-23 05:39:27 UTC +--- src/ghdldrv/ghdldrv.adb.orig 2021-02-02 19:52:50 UTC +++ src/ghdldrv/ghdldrv.adb -@@ -460,7 +460,7 @@ package body Ghdldrv is - Assembler_Cmd := new String'("as"); +@@ -483,7 +483,7 @@ package body Ghdldrv is + Cmd.Assembler_Cmd := new String'("as"); end if; - if Linker_Cmd = null then -- Linker_Cmd := new String'("gcc"); -+ Linker_Cmd := new String'("cc"); + if Cmd.Linker_Cmd = null then +- Cmd.Linker_Cmd := new String'("gcc"); ++ Cmd.Linker_Cmd := new String'("cc"); end if; end Set_Tools_Name; +@@ -755,8 +755,8 @@ package body Ghdldrv is + Put_Line (" Set the path of the ghdl1 compiler"); + Put_Line (" --AS=as"); + Put_Line (" Use as for the assembler"); +- Put_Line (" --LINK=gcc"); +- Put_Line (" Use gcc for the linker driver"); ++ Put_Line (" --LINK=cc"); ++ Put_Line (" Use cc for the linker driver"); + Put_Line (" -S"); + Put_Line (" Do not assemble"); + Put_Line (" -o FILE"); diff --git a/cad/ghdl/files/patch-testsuite_testsuite.sh b/cad/ghdl/files/patch-testsuite_testsuite.sh new file mode 100644 index 000000000000..f691316ccfda --- /dev/null +++ b/cad/ghdl/files/patch-testsuite_testsuite.sh @@ -0,0 +1,11 @@ +--- testsuite/testsuite.sh.orig 2021-02-04 00:41:47 UTC ++++ testsuite/testsuite.sh +@@ -97,7 +97,7 @@ for opt; do + esac + done + +-if [ "x$tests" = "x" ]; then tests="sanity pyunit gna vests synth vpi"; fi ++if [ "x$tests" = "x" ]; then tests="sanity gna vests synth vpi"; fi + + echo "> tests: $tests" + echo "> args: $@" diff --git a/cad/ghdl/pkg-plist b/cad/ghdl/pkg-plist index 5b0ffa1d9134..f619a71ac51f 100644 --- a/cad/ghdl/pkg-plist +++ b/cad/ghdl/pkg-plist @@ -2,6 +2,8 @@ bin/ghdl %%LLVM%%bin/ghdl1-llvm include/vpi_user.h lib/ghdl/ansi_color.sh +%%LLVM%%lib/ghdl/grt-exec.lst +%%LLVM%%lib/ghdl/grt-shared.lst %%LLVM%%lib/ghdl/grt.lst %%LLVM%%lib/ghdl/grt.ver %%LLVM%%lib/ghdl/ieee/v08/fixed_float_types.o @@ -32,7 +34,12 @@ lib/ghdl/ieee/v08/ieee-obj08.cf %%LLVM%%lib/ghdl/ieee/v08/prmtvs_p.o %%LLVM%%lib/ghdl/ieee/v08/std_logic_1164-body.o %%LLVM%%lib/ghdl/ieee/v08/std_logic_1164.o +%%LLVM%%lib/ghdl/ieee/v08/std_logic_arith.o +%%LLVM%%lib/ghdl/ieee/v08/std_logic_misc-body.o +%%LLVM%%lib/ghdl/ieee/v08/std_logic_misc.o +%%LLVM%%lib/ghdl/ieee/v08/std_logic_signed.o %%LLVM%%lib/ghdl/ieee/v08/std_logic_textio.o +%%LLVM%%lib/ghdl/ieee/v08/std_logic_unsigned.o %%LLVM%%lib/ghdl/ieee/v08/timing_b.o %%LLVM%%lib/ghdl/ieee/v08/timing_p.o %%LLVM%%lib/ghdl/ieee/v08/upf-body.o @@ -44,6 +51,12 @@ lib/ghdl/ieee/v87/ieee-obj87.cf %%LLVM%%lib/ghdl/ieee/v87/numeric_std.o %%LLVM%%lib/ghdl/ieee/v87/std_logic_1164-body.o %%LLVM%%lib/ghdl/ieee/v87/std_logic_1164.o +%%LLVM%%lib/ghdl/ieee/v87/std_logic_arith.o +%%LLVM%%lib/ghdl/ieee/v87/std_logic_misc-body.o +%%LLVM%%lib/ghdl/ieee/v87/std_logic_misc.o +%%LLVM%%lib/ghdl/ieee/v87/std_logic_signed.o +%%LLVM%%lib/ghdl/ieee/v87/std_logic_textio.o +%%LLVM%%lib/ghdl/ieee/v87/std_logic_unsigned.o %%LLVM%%lib/ghdl/ieee/v87/upf-body.o %%LLVM%%lib/ghdl/ieee/v87/upf.o %%LLVM%%lib/ghdl/ieee/v87/vital_primitives-body.o @@ -65,30 +78,17 @@ lib/ghdl/ieee/v93/ieee-obj93.cf %%LLVM%%lib/ghdl/ieee/v93/prmtvs_p.o %%LLVM%%lib/ghdl/ieee/v93/std_logic_1164-body.o %%LLVM%%lib/ghdl/ieee/v93/std_logic_1164.o +%%LLVM%%lib/ghdl/ieee/v93/std_logic_arith.o +%%LLVM%%lib/ghdl/ieee/v93/std_logic_misc-body.o +%%LLVM%%lib/ghdl/ieee/v93/std_logic_misc.o +%%LLVM%%lib/ghdl/ieee/v93/std_logic_signed.o +%%LLVM%%lib/ghdl/ieee/v93/std_logic_textio.o +%%LLVM%%lib/ghdl/ieee/v93/std_logic_unsigned.o %%LLVM%%lib/ghdl/ieee/v93/timing_b.o %%LLVM%%lib/ghdl/ieee/v93/timing_p.o %%LLVM%%lib/ghdl/ieee/v93/upf-body.o %%LLVM%%lib/ghdl/ieee/v93/upf.o %%LLVM%%lib/ghdl/libgrt.a -lib/ghdl/mentor/v93/ieee-obj93.cf -%%LLVM%%lib/ghdl/mentor/v93/math_complex-body.o -%%LLVM%%lib/ghdl/mentor/v93/math_complex.o -%%LLVM%%lib/ghdl/mentor/v93/math_real-body.o -%%LLVM%%lib/ghdl/mentor/v93/math_real.o -%%LLVM%%lib/ghdl/mentor/v93/memory_b.o -%%LLVM%%lib/ghdl/mentor/v93/memory_p.o -%%LLVM%%lib/ghdl/mentor/v93/numeric_bit-body.o -%%LLVM%%lib/ghdl/mentor/v93/numeric_bit.o -%%LLVM%%lib/ghdl/mentor/v93/numeric_std-body.o -%%LLVM%%lib/ghdl/mentor/v93/numeric_std.o -%%LLVM%%lib/ghdl/mentor/v93/prmtvs_b.o -%%LLVM%%lib/ghdl/mentor/v93/prmtvs_p.o -%%LLVM%%lib/ghdl/mentor/v93/std_logic_1164-body.o -%%LLVM%%lib/ghdl/mentor/v93/std_logic_1164.o -%%LLVM%%lib/ghdl/mentor/v93/std_logic_arith-body.o -%%LLVM%%lib/ghdl/mentor/v93/std_logic_arith.o -%%LLVM%%lib/ghdl/mentor/v93/timing_b.o -%%LLVM%%lib/ghdl/mentor/v93/timing_p.o lib/ghdl/src/ieee/math_complex-body.vhdl lib/ghdl/src/ieee/math_complex.vhdl lib/ghdl/src/ieee/math_real-body.vhdl @@ -130,10 +130,6 @@ lib/ghdl/src/ieee2008/numeric_std_unsigned.vhdl lib/ghdl/src/ieee2008/std_logic_1164-body.vhdl lib/ghdl/src/ieee2008/std_logic_1164.vhdl lib/ghdl/src/ieee2008/std_logic_textio.vhdl -lib/ghdl/src/mentor/std_logic_arith-body.vhdl -lib/ghdl/src/mentor/std_logic_arith.vhdl -lib/ghdl/src/openieee/upf-body.vhdl -lib/ghdl/src/openieee/upf.vhdl lib/ghdl/src/std/env-body.vhdl lib/ghdl/src/std/env.vhdl lib/ghdl/src/std/v08/standard.vhdl @@ -153,6 +149,8 @@ lib/ghdl/src/synopsys/std_logic_textio.vhdl lib/ghdl/src/synopsys/std_logic_unsigned.vhdl lib/ghdl/src/synopsys/v08/std_logic_misc-body.vhdl lib/ghdl/src/synopsys/v08/std_logic_misc.vhdl +lib/ghdl/src/upf/upf-body.vhdl +lib/ghdl/src/upf/upf.vhdl lib/ghdl/src/vital2000/memory_b.vhdl lib/ghdl/src/vital2000/memory_p.vhdl lib/ghdl/src/vital2000/prmtvs_b.vhdl @@ -177,84 +175,6 @@ lib/ghdl/std/v93/std-obj93.cf %%LLVM%%lib/ghdl/std/v93/std_standard.o %%LLVM%%lib/ghdl/std/v93/textio-body.o %%LLVM%%lib/ghdl/std/v93/textio.o -%%LLVM%%lib/ghdl/synopsys/v08/fixed_float_types.o -%%LLVM%%lib/ghdl/synopsys/v08/fixed_generic_pkg-body.o -%%LLVM%%lib/ghdl/synopsys/v08/fixed_generic_pkg.o -%%LLVM%%lib/ghdl/synopsys/v08/fixed_pkg.o -%%LLVM%%lib/ghdl/synopsys/v08/float_generic_pkg-body.o -%%LLVM%%lib/ghdl/synopsys/v08/float_generic_pkg.o -%%LLVM%%lib/ghdl/synopsys/v08/float_pkg.o -lib/ghdl/synopsys/v08/ieee-obj08.cf -%%LLVM%%lib/ghdl/synopsys/v08/ieee_bit_context.o -%%LLVM%%lib/ghdl/synopsys/v08/ieee_std_context.o -%%LLVM%%lib/ghdl/synopsys/v08/math_complex-body.o -%%LLVM%%lib/ghdl/synopsys/v08/math_complex.o -%%LLVM%%lib/ghdl/synopsys/v08/math_real-body.o -%%LLVM%%lib/ghdl/synopsys/v08/math_real.o -%%LLVM%%lib/ghdl/synopsys/v08/memory_b.o -%%LLVM%%lib/ghdl/synopsys/v08/memory_p.o -%%LLVM%%lib/ghdl/synopsys/v08/numeric_bit-body.o -%%LLVM%%lib/ghdl/synopsys/v08/numeric_bit.o -%%LLVM%%lib/ghdl/synopsys/v08/numeric_bit_unsigned-body.o -%%LLVM%%lib/ghdl/synopsys/v08/numeric_bit_unsigned.o -%%LLVM%%lib/ghdl/synopsys/v08/numeric_std-body.o -%%LLVM%%lib/ghdl/synopsys/v08/numeric_std.o -%%LLVM%%lib/ghdl/synopsys/v08/numeric_std_unsigned-body.o -%%LLVM%%lib/ghdl/synopsys/v08/numeric_std_unsigned.o -%%LLVM%%lib/ghdl/synopsys/v08/prmtvs_b.o -%%LLVM%%lib/ghdl/synopsys/v08/prmtvs_p.o -%%LLVM%%lib/ghdl/synopsys/v08/std_logic_1164-body.o -%%LLVM%%lib/ghdl/synopsys/v08/std_logic_1164.o -%%LLVM%%lib/ghdl/synopsys/v08/std_logic_arith.o -%%LLVM%%lib/ghdl/synopsys/v08/std_logic_misc-body.o -%%LLVM%%lib/ghdl/synopsys/v08/std_logic_misc.o -%%LLVM%%lib/ghdl/synopsys/v08/std_logic_signed.o -%%LLVM%%lib/ghdl/synopsys/v08/std_logic_textio.o -%%LLVM%%lib/ghdl/synopsys/v08/std_logic_unsigned.o -%%LLVM%%lib/ghdl/synopsys/v08/timing_b.o -%%LLVM%%lib/ghdl/synopsys/v08/timing_p.o -%%LLVM%%lib/ghdl/synopsys/v08/upf-body.o -%%LLVM%%lib/ghdl/synopsys/v08/upf.o -lib/ghdl/synopsys/v87/ieee-obj87.cf -%%LLVM%%lib/ghdl/synopsys/v87/numeric_bit-body.o -%%LLVM%%lib/ghdl/synopsys/v87/numeric_bit.o -%%LLVM%%lib/ghdl/synopsys/v87/numeric_std-body.o -%%LLVM%%lib/ghdl/synopsys/v87/numeric_std.o -%%LLVM%%lib/ghdl/synopsys/v87/std_logic_1164-body.o -%%LLVM%%lib/ghdl/synopsys/v87/std_logic_1164.o -%%LLVM%%lib/ghdl/synopsys/v87/std_logic_arith.o -%%LLVM%%lib/ghdl/synopsys/v87/std_logic_misc-body.o -%%LLVM%%lib/ghdl/synopsys/v87/std_logic_misc.o -%%LLVM%%lib/ghdl/synopsys/v87/std_logic_signed.o -%%LLVM%%lib/ghdl/synopsys/v87/std_logic_textio.o -%%LLVM%%lib/ghdl/synopsys/v87/std_logic_unsigned.o -%%LLVM%%lib/ghdl/synopsys/v87/vital_primitives-body.o -%%LLVM%%lib/ghdl/synopsys/v87/vital_primitives.o -%%LLVM%%lib/ghdl/synopsys/v87/vital_timing-body.o -%%LLVM%%lib/ghdl/synopsys/v87/vital_timing.o -lib/ghdl/synopsys/v93/ieee-obj93.cf -%%LLVM%%lib/ghdl/synopsys/v93/math_complex-body.o -%%LLVM%%lib/ghdl/synopsys/v93/math_complex.o -%%LLVM%%lib/ghdl/synopsys/v93/math_real-body.o -%%LLVM%%lib/ghdl/synopsys/v93/math_real.o -%%LLVM%%lib/ghdl/synopsys/v93/memory_b.o -%%LLVM%%lib/ghdl/synopsys/v93/memory_p.o -%%LLVM%%lib/ghdl/synopsys/v93/numeric_bit-body.o -%%LLVM%%lib/ghdl/synopsys/v93/numeric_bit.o -%%LLVM%%lib/ghdl/synopsys/v93/numeric_std-body.o -%%LLVM%%lib/ghdl/synopsys/v93/numeric_std.o -%%LLVM%%lib/ghdl/synopsys/v93/prmtvs_b.o -%%LLVM%%lib/ghdl/synopsys/v93/prmtvs_p.o -%%LLVM%%lib/ghdl/synopsys/v93/std_logic_1164-body.o -%%LLVM%%lib/ghdl/synopsys/v93/std_logic_1164.o -%%LLVM%%lib/ghdl/synopsys/v93/std_logic_arith.o -%%LLVM%%lib/ghdl/synopsys/v93/std_logic_misc-body.o -%%LLVM%%lib/ghdl/synopsys/v93/std_logic_misc.o -%%LLVM%%lib/ghdl/synopsys/v93/std_logic_signed.o -%%LLVM%%lib/ghdl/synopsys/v93/std_logic_textio.o -%%LLVM%%lib/ghdl/synopsys/v93/std_logic_unsigned.o -%%LLVM%%lib/ghdl/synopsys/v93/timing_b.o -%%LLVM%%lib/ghdl/synopsys/v93/timing_p.o lib/ghdl/vendors/README.md lib/ghdl/vendors/compile-altera.ps1 lib/ghdl/vendors/compile-altera.sh @@ -266,15 +186,13 @@ lib/ghdl/vendors/compile-osvvm.ps1 lib/ghdl/vendors/compile-osvvm.sh lib/ghdl/vendors/compile-uvvm.ps1 lib/ghdl/vendors/compile-uvvm.sh -lib/ghdl/vendors/compile-vunit.ps1 lib/ghdl/vendors/compile-xilinx-ise.ps1 lib/ghdl/vendors/compile-xilinx-ise.sh lib/ghdl/vendors/compile-xilinx-vivado.ps1 lib/ghdl/vendors/compile-xilinx-vivado.sh lib/ghdl/vendors/config.psm1 lib/ghdl/vendors/config.sh -lib/ghdl/vendors/ghdl.grcrules -lib/ghdl/vendors/ghdl.skipwarning.grcrules +lib/ghdl/vendors/filter.analyze.sh lib/ghdl/vendors/shared.psm1 lib/ghdl/vendors/shared.sh lib/libghdlvpi.so |