summaryrefslogtreecommitdiff
path: root/sci-electronics/ghdl
diff options
context:
space:
mode:
Diffstat (limited to 'sci-electronics/ghdl')
-rw-r--r--sci-electronics/ghdl/Manifest3
-rw-r--r--sci-electronics/ghdl/files/ghdl-4.1.0-tests-fix.patch266
-rw-r--r--sci-electronics/ghdl/ghdl-4.1.0-r2.ebuild (renamed from sci-electronics/ghdl/ghdl-4.1.0-r1.ebuild)9
3 files changed, 274 insertions, 4 deletions
diff --git a/sci-electronics/ghdl/Manifest b/sci-electronics/ghdl/Manifest
index f6bbd60a3879..2565b359c8ff 100644
--- a/sci-electronics/ghdl/Manifest
+++ b/sci-electronics/ghdl/Manifest
@@ -1,6 +1,7 @@
AUX ghdl-4.0.0_pre20231218-no-pyunit.patch 689 BLAKE2B 2df3df07e290240b2e99422fda33d2ccee9f01a5f3c3aa3535e40ab66bf5de95cbef3821a3e31b0f36b82f5bc90e078e9d2f9424ea5226f7c671ce4dec571458 SHA512 9149bb90346b0c97683a4ed7056cecb727f4ff9a5b89f8b4046983475cd40937f363438129304c72199442bcc3ad948f2c86cb38b6bd0d314dba9199f34a37a6
+AUX ghdl-4.1.0-tests-fix.patch 6625 BLAKE2B b5d6a46ff2e27d11e526fa0967e237826dc168e81b1317b7a43aeb3bdf72095b1b6c5f5eb6f54739b73a1183eba869314e49a0385b57cf27ea53e251dd512c8f SHA512 fa94ff790d6f0c34f069554fc587bc5e85bd84198cc01f91374b8f8bccdf5e487052a035ffa52ae8a1bcbae332c7b8d59912d73abf8fdbf3d4854e5e42cb528c
DIST ghdl-4.1.0.tar.gz 7704716 BLAKE2B d69791d947ed11b62fac8e076c3b9e1bad606a0de57e8d5bd67c9a8f7ea0cad73643085efbaaa06fabdd5900366334b63385589da72f4db488f5b27b142a76f8 SHA512 0a3a465f7f8ed7fba9b81b5dec2903bf82731c97a127666e7644286c9ea80078354be4e6bf8947a6ef631b646dc7e8e69dce2d9a467ac36ee03c67d9335a2703
DIST ghdl-5.0.1.tar.gz 7851730 BLAKE2B 110f17e7891a4e89aaa27e763f1f8c0354bd6054641b1a17c1f037b5b07a573781c36a3657a0501252b76c03e63f485f2099fcee59ef451aab17939cdd20a222 SHA512 c07dab30b779f0dd424e588b66d32351bdfcc9cab6da5bb5ea85c477083bda6a0f99c2301e55bb2c285d7765911a0fc0b0c8079933b1abdda553d126f2e58400
-EBUILD ghdl-4.1.0-r1.ebuild 1749 BLAKE2B e7737ba8f156ec920d63371c3b8cdf2a276a434833fa0a929e00a6915a780daa5e59cb6065982a41c41587b8ec902378e8266aaf9b53c7295589dbb389cbba18 SHA512 e31e5618327bc7cfa35b0947b9b0d0dd1a97d43955b5a3bd60f221f6542396f459365d59432b4c63178e5e48035ca33fbe9cf960d24646e9b5e8016fba89c923
+EBUILD ghdl-4.1.0-r2.ebuild 1781 BLAKE2B 99d11c4277126b9e922f43a06eef0b23bf88d4ddbbc3eb0089422c64a4abed19f8e057009d618691a1a631e9009fa033913b5778978cadf69bd0b658dd8fc222 SHA512 152643870bc40acdce297e7d5ea6bd5b4a4e4950f974159e349d5bad51e7233b064a2ac34ce1f900498f70d2539aca858149a61ee48cd3533805bb9691f42f0d
EBUILD ghdl-5.0.1.ebuild 1734 BLAKE2B 9abbcd81b6eaf2fd9f997c35552ec2b8f8200f5441b08330b923e2a07ee219e4967ee56f4cf4c01d66322a8182cd3ef898fc54f01830ad4e86d27e4c5e0350d0 SHA512 30b623a8c55d9d1140b8793ec6e444eae79be35af78ca5fa7871d66d6f99a4e79aa4613b8de663c36d0af028501c2ca019f395b381ce2b07a546d1ce26ccc727
MISC metadata.xml 1462 BLAKE2B a403ab50a3463fc26ddfb6ad65aa2cfe9782e98b74cd91fe24ef81678e7c52a2211b0bcad27accc4cd57db281ed23ad5d8697ae69dd8b67c623465949d6d3434 SHA512 4bd4c20a8fbbdaa80a63373f81bd96144e110371403832627aba81a7a95d073ee73922516a6d5c193898affbeb8bd7f1ce9fc4203faa13464cf39ba809c82d5d
diff --git a/sci-electronics/ghdl/files/ghdl-4.1.0-tests-fix.patch b/sci-electronics/ghdl/files/ghdl-4.1.0-tests-fix.patch
new file mode 100644
index 000000000000..e01addfaf4d1
--- /dev/null
+++ b/sci-electronics/ghdl/files/ghdl-4.1.0-tests-fix.patch
@@ -0,0 +1,266 @@
+From a9fe853e63229603a8958fd80ff8b996dd49c950 Mon Sep 17 00:00:00 2001
+From: Tristan Gingold <tgingold@free.fr>
+Date: Sun, 26 May 2024 09:57:54 +0200
+Subject: [PATCH] testsuite/gna: fix vpi prototypes
+
+Fix #2663
+---
+ testsuite/gna/issue450/vpi2.c | 6 ++++--
+ testsuite/gna/issue98/vpi1.c | 7 ++++---
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/testsuite/gna/issue450/vpi2.c b/testsuite/gna/issue450/vpi2.c
+index 0debb546b5..f1d652bb71 100644
+--- a/testsuite/gna/issue450/vpi2.c
++++ b/testsuite/gna/issue450/vpi2.c
+@@ -40,7 +40,7 @@ void printContent (vpiHandle parent)
+ }
+ }
+
+-void printModules()
++PLI_INT32 printModules(s_cb_data *cb)
+ {
+ vpiHandle topModIterator;
+ vpiHandle topModHandle;
+@@ -53,7 +53,7 @@ void printModules()
+ vpi_printf ("got to here1 \n");
+ if (!topModIterator)
+ {
+- return;
++ return -1;
+ }
+
+ /* use vpi_scan to iterate throught modules */
+@@ -64,6 +64,8 @@ void printModules()
+
+ printContent (topModHandle);
+ }
++
++ return 0;
+ }
+
+
+diff --git a/testsuite/gna/issue98/vpi1.c b/testsuite/gna/issue98/vpi1.c
+index 0adae07fe4..a14b89df23 100644
+--- a/testsuite/gna/issue98/vpi1.c
++++ b/testsuite/gna/issue98/vpi1.c
+@@ -1,8 +1,8 @@
+ #include <stdio.h>
+ #include <vpi_user.h>
+
+-void
+-vpi_proc (void)
++PLI_INT32
++vpi_proc (s_cb_data *cb)
+ {
+ vpiHandle net;
+ s_vpi_value val;
+@@ -11,11 +11,12 @@ vpi_proc (void)
+ if (net == NULL)
+ {
+ printf ("cannot get net\n");
+- return;
++ return -1;
+ }
+ val.format = vpiBinStrVal;
+ vpi_get_value (net, &val);
+ printf ("value: %s\n", val.value.str);
++ return 0;
+ }
+
+ void my_handle_register()
+From 5c4d2509b47d416470cdac59bb81955f5aacfee3 Mon Sep 17 00:00:00 2001
+From: Tristan Gingold <tgingold@free.fr>
+Date: Sun, 26 May 2024 16:58:25 +0200
+Subject: [PATCH] testsuite/vpi: fix callback types (continue)
+
+---
+ testsuite/vpi/vpi002/vpi1.c | 7 ++++---
+ testsuite/vpi/vpi004/vpi1.c | 13 +++++++------
+ 2 files changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/testsuite/vpi/vpi002/vpi1.c b/testsuite/vpi/vpi002/vpi1.c
+index d6f1b42fb7..53d51250ee 100644
+--- a/testsuite/vpi/vpi002/vpi1.c
++++ b/testsuite/vpi/vpi002/vpi1.c
+@@ -2,8 +2,8 @@
+ #include <vpi_user.h>
+ #define N_NAMES 12
+
+-void
+-vpi_proc (void)
++PLI_INT32
++vpi_proc (s_cb_data *cb)
+ {
+ vpiHandle net;
+ s_vpi_value val;
+@@ -54,12 +54,13 @@ vpi_proc (void)
+ if (net == NULL)
+ {
+ printf ("Error: Failed to find the net %s\n", names[name_index]);
+- return;
++ return -1;
+ }
+ val.format = vpiBinStrVal;
+ vpi_get_value (net, &val);
+ printf ("value: %s\n", val.value.str);
+ }
++ return 0;
+ }
+
+ void my_handle_register()
+diff --git a/testsuite/vpi/vpi004/vpi1.c b/testsuite/vpi/vpi004/vpi1.c
+index 25d426fe7b..26ecf7c272 100644
+--- a/testsuite/vpi/vpi004/vpi1.c
++++ b/testsuite/vpi/vpi004/vpi1.c
+@@ -2,8 +2,8 @@
+ #include <vpi_user.h>
+ #define N_NAMES 12
+
+-void
+-vpi_proc (void)
++PLI_INT32
++vpi_proc (s_cb_data *cb)
+ {
+ s_vpi_vlog_info info;
+ int i;
+@@ -11,12 +11,12 @@ vpi_proc (void)
+ int ret = vpi_get_vlog_info(&info);
+ if (ret != 1) {
+ printf ("Error: Failed to get vlog_info\n");
+- return;
++ return -1;
+ }
+
+ if (info.argc < 1) {
+ printf ("Error: Argc was 0\n");
+- return;
++ return -1;
+ }
+ printf ("Argc: %d\n", info.argc);
+
+@@ -26,15 +26,16 @@ vpi_proc (void)
+
+ if (info.product == NULL) {
+ printf ("Error: product is NULL\n");
+- return;
++ return -1;
+ }
+ printf ("Product: %s\n", info.product);
+
+ if (info.version == NULL) {
+ printf ("Error: version is NULL\n");
+- return;
++ return -1;
+ }
+ printf ("Version: %s\n", info.version);
++ return 0;
+ }
+
+ void my_handle_register()
+From 659a5d7a018d011aad23235bfd3e306072436a8b Mon Sep 17 00:00:00 2001
+From: Tristan Gingold <tgingold@free.fr>
+Date: Sun, 26 May 2024 16:21:04 +0200
+Subject: [PATCH] testsuite/vpi: fix callback types
+
+---
+ testsuite/vpi/vpi001/vpi1.c | 7 ++++---
+ testsuite/vpi/vpi003/vpi1.c | 7 ++++---
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/testsuite/vpi/vpi001/vpi1.c b/testsuite/vpi/vpi001/vpi1.c
+index c266b5cd75..a1ff9fb5d4 100644
+--- a/testsuite/vpi/vpi001/vpi1.c
++++ b/testsuite/vpi/vpi001/vpi1.c
+@@ -2,8 +2,8 @@
+ #include <vpi_user.h>
+ #define N_NAMES 12
+
+-void
+-vpi_proc (void)
++PLI_INT32
++vpi_proc (s_cb_data *cb)
+ {
+ vpiHandle net;
+ s_vpi_value val;
+@@ -39,12 +39,13 @@ vpi_proc (void)
+ if (net == NULL)
+ {
+ printf ("Error: Failed to find the net %s\n", names[name_index]);
+- return;
++ return -1;
+ }
+ val.format = vpiBinStrVal;
+ vpi_get_value (net, &val);
+ printf ("value: %s\n", val.value.str);
+ }
++ return 0;
+ }
+
+ void my_handle_register()
+diff --git a/testsuite/vpi/vpi003/vpi1.c b/testsuite/vpi/vpi003/vpi1.c
+index d7a6f8241c..8bd18873d0 100644
+--- a/testsuite/vpi/vpi003/vpi1.c
++++ b/testsuite/vpi/vpi003/vpi1.c
+@@ -2,8 +2,8 @@
+ #include <vpi_user.h>
+ #define N_NAMES 0
+
+-void
+-vpi_proc (void)
++PLI_INT32
++vpi_proc (s_cb_data *cb)
+ {
+ vpiHandle net;
+ s_vpi_value val;
+@@ -29,12 +29,13 @@ vpi_proc (void)
+ if (net == NULL)
+ {
+ printf ("Error: Failed to find the net %s\n", names[name_index]);
+- return;
++ return -1;
+ }
+ val.format = vpiBinStrVal;
+ vpi_get_value (net, &val);
+ printf ("value: %s\n", val.value.str);
+ }
++ return 0;
+ }
+
+ void my_handle_register()
+From 9e7a317cea2473a31e18f63b9392912b7da8e63d Mon Sep 17 00:00:00 2001
+From: Tristan Gingold <tgingold@free.fr>
+Date: Sun, 26 May 2024 17:22:54 +0200
+Subject: [PATCH] testsuite/vhpi: fix prototypes
+
+---
+ testsuite/vhpi/004trace_stdout/vhpi_lib.c | 2 +-
+ testsuite/vhpi/005trace_file/vhpi_lib.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/testsuite/vhpi/004trace_stdout/vhpi_lib.c b/testsuite/vhpi/004trace_stdout/vhpi_lib.c
+index 1bc1fca00b..df44f1e39c 100644
+--- a/testsuite/vhpi/004trace_stdout/vhpi_lib.c
++++ b/testsuite/vhpi/004trace_stdout/vhpi_lib.c
+@@ -23,7 +23,7 @@ void my_startup()
+ time.high = 0;
+ time.low = 0;
+
+- vhpi_register_cb(&cb_data, NULL);
++ vhpi_register_cb(&cb_data, 0);
+ }
+
+ void (*vhpi_startup_routines[]) () =
+diff --git a/testsuite/vhpi/005trace_file/vhpi_lib.c b/testsuite/vhpi/005trace_file/vhpi_lib.c
+index 66ce5e1152..a0444c3f05 100644
+--- a/testsuite/vhpi/005trace_file/vhpi_lib.c
++++ b/testsuite/vhpi/005trace_file/vhpi_lib.c
+@@ -21,7 +21,7 @@ void my_startup()
+ time.high = 0;
+ time.low = 0;
+
+- vhpi_register_cb(&cb_data, NULL);
++ vhpi_register_cb(&cb_data, 0);
+ }
+
+ void (*vhpi_startup_routines[]) () =
diff --git a/sci-electronics/ghdl/ghdl-4.1.0-r1.ebuild b/sci-electronics/ghdl/ghdl-4.1.0-r2.ebuild
index 85bab5de8804..802fddb11784 100644
--- a/sci-electronics/ghdl/ghdl-4.1.0-r1.ebuild
+++ b/sci-electronics/ghdl/ghdl-4.1.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-ADA_COMPAT=( gnat_2021 gcc_13 )
+ADA_COMPAT=( gcc_{13,14} )
LLVM_COMPAT=( {16..17} ) # Check configure script for supported LLVM versions.
inherit ada edo llvm-r1 toolchain-funcs
@@ -45,7 +45,10 @@ BDEPEND="
dev-util/patchelf
"
-PATCHES=( "${FILESDIR}/${PN}-4.0.0_pre20231218-no-pyunit.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-4.0.0_pre20231218-no-pyunit.patch"
+ "${FILESDIR}"/${P}-tests-fix.patch
+)
pkg_setup() {
ada_pkg_setup
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-14 07:52:12 +0000