From c782320b17ab1d6542682af11134a1976ce327be Mon Sep 17 00:00:00 2001 From: m3tav3rse Date: Thu, 17 Aug 2023 20:49:08 +0200 Subject: [PATCH] ghdl: update to 3.0.0, orphan --- srcpkgs/ghdl/patches/gcc11.patch | 26 ------------ srcpkgs/ghdl/patches/gcc12.patch | 68 ------------------------------- srcpkgs/ghdl/patches/gcc12b.patch | 63 ---------------------------- srcpkgs/ghdl/patches/musl.patch | 58 -------------------------- srcpkgs/ghdl/template | 21 ++++------ 5 files changed, 8 insertions(+), 228 deletions(-) delete mode 100644 srcpkgs/ghdl/patches/gcc11.patch delete mode 100644 srcpkgs/ghdl/patches/gcc12.patch delete mode 100644 srcpkgs/ghdl/patches/gcc12b.patch delete mode 100644 srcpkgs/ghdl/patches/musl.patch diff --git a/srcpkgs/ghdl/patches/gcc11.patch b/srcpkgs/ghdl/patches/gcc11.patch deleted file mode 100644 index f13a4c634ef5b..0000000000000 --- a/srcpkgs/ghdl/patches/gcc11.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f8b87697e8b893b6293ebbfc34670c32bfb49397 Mon Sep 17 00:00:00 2001 -From: Tristan Gingold -Date: Thu, 12 May 2022 18:16:38 +0200 -Subject: [PATCH] ghdllocal.adb: move pragma suppress. Fix #2056 - ---- - src/ghdldrv/ghdllocal.adb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ghdldrv/ghdllocal.adb b/src/ghdldrv/ghdllocal.adb -index 4ed71a590a..756589602b 100644 ---- a/src/ghdldrv/ghdllocal.adb -+++ b/src/ghdldrv/ghdllocal.adb -@@ -1259,11 +1259,11 @@ package body Ghdllocal is - Src : String_Access; - Dst : String_Access; - Success : Boolean; -- pragma Unreferenced (Success); - begin - Src := new String'(Image (Dir) & Basename & Get_Object_Suffix.all); - Dst := new String'(Basename & Get_Object_Suffix.all); - Copy_File (Src.all, Dst.all, Success, Overwrite, Full); -+ pragma Unreferenced (Success); - -- Be silent in case of error. - Free (Src); - Free (Dst); diff --git a/srcpkgs/ghdl/patches/gcc12.patch b/srcpkgs/ghdl/patches/gcc12.patch deleted file mode 100644 index c22e1f099094f..0000000000000 --- a/srcpkgs/ghdl/patches/gcc12.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 8c5689b93e68ac34cdf7dd089a3990ae22f0049c Mon Sep 17 00:00:00 2001 -From: Xiretza -Date: Sat, 14 May 2022 11:46:53 +0200 -Subject: [PATCH] fix: avoid "pragma Unreferenced given" warnings with GCC 12 - ---- - src/ghdldrv/ghdldrv.adb | 2 +- - src/synth/synth-vhdl_stmts.adb | 2 +- - src/vhdl/translate/trans-chap2.adb | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/ghdldrv/ghdldrv.adb b/src/ghdldrv/ghdldrv.adb -index e7990ed4d4..0313e60579 100644 ---- a/src/ghdldrv/ghdldrv.adb -+++ b/src/ghdldrv/ghdldrv.adb -@@ -1192,7 +1192,6 @@ package body Ghdldrv is - procedure Perform_Action (Cmd : in out Command_Elab; Args : Argument_List) - is - Success : Boolean; -- pragma Unreferenced (Success); - begin - Set_Elab_Units (Cmd, "-e", Args); - Setup_Compiler (Cmd, False); -@@ -1202,6 +1201,7 @@ package body Ghdldrv is - Link (Cmd, Add_Std => True, Disp_Only => False); - end if; - Delete_File (Filelist_Name.all, Success); -+ pragma Unreferenced (Success); - end Perform_Action; - - -- Command Run. -diff --git a/src/synth/synth-vhdl_stmts.adb b/src/synth/synth-vhdl_stmts.adb -index 3e09c3318e..6fa2e92272 100644 ---- a/src/synth/synth-vhdl_stmts.adb -+++ b/src/synth/synth-vhdl_stmts.adb -@@ -1933,11 +1933,11 @@ package body Synth.Vhdl_Stmts is - Assoc_Chain : Node) - is - Infos : Target_Info_Array (1 .. 0); -- pragma Unreferenced (Infos); - Init : Association_Iterator_Init; - begin - Init := Association_Iterator_Build (Inter_Chain, Assoc_Chain); - Synth_Subprogram_Association (Subprg_Inst, Caller_Inst, Init, Infos); -+ pragma Unreferenced (Infos); - end Synth_Subprogram_Association; - - -- Create wires for out and inout interface variables. -diff --git a/src/vhdl/translate/trans-chap2.adb b/src/vhdl/translate/trans-chap2.adb -index ff04a13b78..9e7e329157 100644 ---- a/src/vhdl/translate/trans-chap2.adb -+++ b/src/vhdl/translate/trans-chap2.adb -@@ -1006,7 +1006,6 @@ package body Trans.Chap2 is - Info : constant Ortho_Info_Acc := Get_Info (Spec); - Final : Boolean; - Constr : O_Assoc_List; -- pragma Unreferenced (Final); - begin - if not Is_Nested then - Start_Subprogram_Body (Info.Package_Elab_Spec_Subprg); -@@ -1039,6 +1038,7 @@ package body Trans.Chap2 is - (Info.Package_Spec_Scope'Access, Info.Package_Spec_Scope)); - end if; - Chap4.Elab_Declaration_Chain (Spec, Final); -+ pragma Unreferenced (Final); - - if not Is_Nested then - Close_Temp; diff --git a/srcpkgs/ghdl/patches/gcc12b.patch b/srcpkgs/ghdl/patches/gcc12b.patch deleted file mode 100644 index 05ae2d78d9794..0000000000000 --- a/srcpkgs/ghdl/patches/gcc12b.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 4c3825daf54f81433e5de46cc25fdfac7189ffab Mon Sep 17 00:00:00 2001 -From: Xiretza -Date: Sat, 14 May 2022 11:45:56 +0200 -Subject: [PATCH] fix: avoid "unnecessary with of ancestor [-gnatwr]" with GCC - 12 - ---- - src/ortho/mcode/ortho_code-x86-abi.adb | 1 - - src/synth/netlists-disp_dot.ads | 2 -- - src/synth/netlists-inference.ads | 1 - - src/vhdl/translate/trans-rtis.adb | 2 +- - 4 files changed, 1 insertion(+), 5 deletions(-) - -diff --git a/src/ortho/mcode/ortho_code-x86-abi.adb b/src/ortho/mcode/ortho_code-x86-abi.adb -index fd543ef2ed..2b0d778fa0 100644 ---- a/src/ortho/mcode/ortho_code-x86-abi.adb -+++ b/src/ortho/mcode/ortho_code-x86-abi.adb -@@ -24,7 +24,6 @@ with Ortho_Code.Debug; - with Ortho_Code.Disps; - with Ortho_Code.Flags; - with Ortho_Code.Dwarf; --with Ortho_Code.X86; use Ortho_Code.X86; - with Ortho_Code.X86.Insns; - with Ortho_Code.X86.Emits; - with Binary_File; -diff --git a/src/synth/netlists-disp_dot.ads b/src/synth/netlists-disp_dot.ads -index 416554c766..01f07d41eb 100644 ---- a/src/synth/netlists-disp_dot.ads -+++ b/src/synth/netlists-disp_dot.ads -@@ -16,8 +16,6 @@ - -- You should have received a copy of the GNU General Public License - -- along with this program. If not, see . - --with Netlists; -- - package Netlists.Disp_Dot is - procedure Disp_Dot_Top_Module (M : Module); - end Netlists.Disp_Dot; -diff --git a/src/synth/netlists-inference.ads b/src/synth/netlists-inference.ads -index ae671a0ac4..8a6aef2f30 100644 ---- a/src/synth/netlists-inference.ads -+++ b/src/synth/netlists-inference.ads -@@ -16,7 +16,6 @@ - -- You should have received a copy of the GNU General Public License - -- along with this program. If not, see . - --with Netlists; use Netlists; - with Netlists.Builders; use Netlists.Builders; - - package Netlists.Inference is -diff --git a/src/vhdl/translate/trans-rtis.adb b/src/vhdl/translate/trans-rtis.adb -index 8f658ae39f..eeddad578b 100644 ---- a/src/vhdl/translate/trans-rtis.adb -+++ b/src/vhdl/translate/trans-rtis.adb -@@ -21,7 +21,7 @@ with Vhdl.Utils; use Vhdl.Utils; - with Vhdl.Configuration; - with Libraries; - with Trans.Chap7; --with Trans; use Trans.Helpers; -+use Trans.Helpers; - with Trans.Helpers2; use Trans.Helpers2; - - package body Trans.Rtis is diff --git a/srcpkgs/ghdl/patches/musl.patch b/srcpkgs/ghdl/patches/musl.patch deleted file mode 100644 index 0f5dc41819c7d..0000000000000 --- a/srcpkgs/ghdl/patches/musl.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 7ab20a0919c2bd62182cd0f93ce3d275c6eb4492 Mon Sep 17 00:00:00 2001 -From: Guiltybyte -Date: Thu, 9 Jun 2022 15:54:07 +0100 -Subject: [PATCH 1/2] Only enable backtrace on linux if glibc is present - ---- - src/grt/config/jumps.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/grt/config/jumps.c b/src/grt/config/jumps.c -index 9a2ee10467..9a2f25bef7 100644 ---- a/src/grt/config/jumps.c -+++ b/src/grt/config/jumps.c -@@ -27,7 +27,7 @@ - #include - #include - --#if ( defined (__linux__) || defined (__APPLE__) ) && !defined (__ANDROID__) -+#if ( (defined (__linux__) && defined (__GLIBC__) ) || defined (__APPLE__) ) && !defined (__ANDROID__) - #define HAVE_BACKTRACE 1 - #include - #endif -@@ -97,8 +97,10 @@ get_bt_from_ucontext (void *uctxt, struct backtrace_addrs *bt) - #ifdef HAVE_BACKTRACE - bt->size = backtrace (bt->addrs, sizeof (bt->addrs) / sizeof (void *)); - bt->skip = 0; -+ #pragma message "HAVE_BACKTRACE=1" - #else - bt->size = 0; -+ #pragma message "HAVE_BACKTRACE=0" - return; - #endif - - -From c58a8c30daa3c5a371ef7cfc52175319986efeaf Mon Sep 17 00:00:00 2001 -From: Guiltybyte -Date: Thu, 9 Jun 2022 15:57:58 +0100 -Subject: [PATCH 2/2] deleted pragma messages - ---- - src/grt/config/jumps.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/grt/config/jumps.c b/src/grt/config/jumps.c -index 9a2f25bef7..0b01409e73 100644 ---- a/src/grt/config/jumps.c -+++ b/src/grt/config/jumps.c -@@ -97,10 +97,8 @@ get_bt_from_ucontext (void *uctxt, struct backtrace_addrs *bt) - #ifdef HAVE_BACKTRACE - bt->size = backtrace (bt->addrs, sizeof (bt->addrs) / sizeof (void *)); - bt->skip = 0; -- #pragma message "HAVE_BACKTRACE=1" - #else - bt->size = 0; -- #pragma message "HAVE_BACKTRACE=0" - return; - #endif - diff --git a/srcpkgs/ghdl/template b/srcpkgs/ghdl/template index 336c659996754..2c1d43deb5e76 100644 --- a/srcpkgs/ghdl/template +++ b/srcpkgs/ghdl/template @@ -6,23 +6,23 @@ # pkgname=ghdl reverts="20181129_1" -version=2.0.0 -revision=2 +version=3.0.0 +revision=1 build_style=configure configure_args="--prefix=/usr --srcdir=.. --disable-werror" makedepends="zlib-devel" short_desc="VHDL 2008/93/87 simulator" -maintainer="m3tav3rse " +maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/ghdl/ghdl" changelog="https://raw.githubusercontent.com/ghdl/ghdl/master/NEWS.md" distfiles="https://github.com/ghdl/ghdl/archive/v${version}.tar.gz" -checksum=5f258369e0faf730298916dfdc134c54c25a7a8a7f19722b7ce2717db19af6ec +checksum=c1ed4d2095df80131260a48c55bb53409ce8d4c38bba42618ca040115faf08b9 nocross=yes +# testsuite is big and long make_check=extended build_options="llvm mcode" -#build_options_default=" " desc_option_llvm="Build the portable LLVM backend" desc_option_mcode="Build the x86-only mcode backend" @@ -84,21 +84,16 @@ do_install() { } do_check() { - # the testsuite is broken - # after a while it fails with this: - # ghdl: unknown command '--synth', try --help - # this indicates a bug in the testsuite - : && return 0 - - # need a temporary installation for testsuite run so that ghdl1 is found + # need a temporary installation for testsuite run so that ghdl is found for variant in ${build_options_default}; do cd ${wrksrc}/build_${variant} mkdir -p tmp_inst/usr/bin ln -sf ghdl-${variant} tmp_inst/usr/bin/ghdl make DESTDIR=${wrksrc}/build_${variant}/tmp_inst install cd ../testsuite + # run all tests but pyunit GHDL="${wrksrc}/build_${variant}/tmp_inst/usr/bin/ghdl" \ - ./testsuite.sh + ./testsuite.sh sanity gna synth vpi vhpi cd ${wrksrc} done }