[PR PATCH] ghdl: update to 2.0.0.

[PR PATCH] ghdl: update to 2.0.0.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1242 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages ghdl
https://github.com/void-linux/void-packages/pull/40773

ghdl: update to 2.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40773.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghdl-40773.patch --]
[-- Type: text/x-diff, Size: 19245 bytes --]

From 600d5703bd851fc40725110d85ad50f266e8245a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 23 Nov 2022 21:07:12 +0700
Subject: [PATCH] ghdl: update to 2.0.0.

---
 ...b764f49666616063d4239df83b5aed961fff.patch | 49 ----------
 srcpkgs/ghdl/patches/curdir.patch             | 11 ---
 srcpkgs/ghdl/patches/gcc-12.patch             | 94 +++++++++++++++++++
 srcpkgs/ghdl/patches/install-paths.patch      | 76 +++++++--------
 srcpkgs/ghdl/patches/llvm12.patch             | 12 ---
 srcpkgs/ghdl/patches/musl.patch               |  8 +-
 srcpkgs/ghdl/patches/respect-ldflags.patch    | 27 ++----
 srcpkgs/ghdl/template                         |  7 +-
 8 files changed, 150 insertions(+), 134 deletions(-)
 delete mode 100644 srcpkgs/ghdl/patches/396eb764f49666616063d4239df83b5aed961fff.patch
 delete mode 100644 srcpkgs/ghdl/patches/curdir.patch
 create mode 100644 srcpkgs/ghdl/patches/gcc-12.patch
 delete mode 100644 srcpkgs/ghdl/patches/llvm12.patch

diff --git a/srcpkgs/ghdl/patches/396eb764f49666616063d4239df83b5aed961fff.patch b/srcpkgs/ghdl/patches/396eb764f49666616063d4239df83b5aed961fff.patch
deleted file mode 100644
index 23c5673e593e..000000000000
--- a/srcpkgs/ghdl/patches/396eb764f49666616063d4239df83b5aed961fff.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 396eb764f49666616063d4239df83b5aed961fff Mon Sep 17 00:00:00 2001
-From: Jeroen Van den Keybus <jeroen.vandenkeybus@gmail.com>
-Date: Mon, 26 Apr 2021 20:17:40 +0200
-Subject: [PATCH] Migrate deprecated DebugLoc::get to DILocation::get
-
----
- src/ortho/llvm6/llvm-cbindings.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/ortho/llvm6/llvm-cbindings.cpp b/src/ortho/llvm6/llvm-cbindings.cpp
-index f82845ffcd..98470d8fab 100644
---- a/src/ortho/llvm6/llvm-cbindings.cpp
-+++ b/src/ortho/llvm6/llvm-cbindings.cpp
-@@ -1254,7 +1254,7 @@ new_var_decl(ODnode *Res, OIdent Ident, OStorage Storage, OTnode Atype)
-          DebugCurrentLine, Atype->Dbg, true);
-       DBuilder->insertDeclare
-         (unwrap(Decl), D, DBuilder->createExpression(),
--         DebugLoc::get(DebugCurrentLine, 0, DebugCurrentScope),
-+         DILocation::get(DebugCurrentScope->getContext(), DebugCurrentLine, 0, DebugCurrentScope),
-          unwrap(LLVMGetInsertBlock(DeclBuilder)));
-     }
- #endif
-@@ -1597,7 +1597,7 @@ start_subprogram_body(ODnodeSubprg *Func)
-     DebugCurrentScope = DebugCurrentSubprg;
- 
-     unwrap(Builder)->SetCurrentDebugLocation
--      (DebugLoc::get(DebugCurrentLine, 0, DebugCurrentScope));
-+      (DILocation::get(DebugCurrentScope->getContext(), DebugCurrentLine, 0, DebugCurrentScope));
-   }
- 
-   if (FlagDebug) {
-@@ -1612,7 +1612,7 @@ start_subprogram_body(ODnodeSubprg *Func)
-          DebugCurrentFile, DebugCurrentLine, Inter->Dtype->Dbg, true);
-       DBuilder->insertDeclare
-         (unwrap(Var), D, DBuilder->createExpression(),
--         DebugLoc::get(DebugCurrentLine, 0, DebugCurrentSubprg),
-+         DILocation::get(DebugCurrentSubprg->getContext(), DebugCurrentLine, 0, DebugCurrentSubprg),
-          unwrap(LLVMGetInsertBlock(DeclBuilder)));
-       LLVMBuildStore(DeclBuilder, Inter->Ref, Var);
-       Inter->Ref = Var;
-@@ -2759,7 +2759,7 @@ new_debug_line_stmt (unsigned Line)
-   if (FlagDebugLines && Line != DebugCurrentLine) {
-     DebugCurrentLine = Line;
-     unwrap(Builder)->SetCurrentDebugLocation
--      (DebugLoc::get(DebugCurrentLine, 0, DebugCurrentScope));
-+      (DILocation::get(DebugCurrentScope->getContext(), DebugCurrentLine, 0, DebugCurrentScope));
-   }
- #endif
- }
diff --git a/srcpkgs/ghdl/patches/curdir.patch b/srcpkgs/ghdl/patches/curdir.patch
deleted file mode 100644
index 12e7648e7d45..000000000000
--- a/srcpkgs/ghdl/patches/curdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -44,7 +44,7 @@
- 
- INSTALL_PROGRAM=install -m 755
- INSTALL_DATA=install -m 644
--PWD?=$(shell pwd)
-+PWD=$(CURDIR)
- DESTDIR=
- bindir=$(prefix)/bin
- libdir=$(prefix)/lib
diff --git a/srcpkgs/ghdl/patches/gcc-12.patch b/srcpkgs/ghdl/patches/gcc-12.patch
new file mode 100644
index 000000000000..c90d5435b170
--- /dev/null
+++ b/srcpkgs/ghdl/patches/gcc-12.patch
@@ -0,0 +1,94 @@
+From f8b87697e8b893b6293ebbfc34670c32bfb49397 Mon Sep 17 00:00:00 2001
+From: Tristan Gingold <tgingold@free.fr>
+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(-)
+
+Index: ghdl-2.0.0/src/ghdldrv/ghdllocal.adb
+===================================================================
+--- ghdl-2.0.0.orig/src/ghdldrv/ghdllocal.adb
++++ ghdl-2.0.0/src/ghdldrv/ghdllocal.adb
+@@ -1158,11 +1158,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);
+From 8c5689b93e68ac34cdf7dd089a3990ae22f0049c Mon Sep 17 00:00:00 2001
+From: Xiretza <xiretza@xiretza.xyz>
+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/install-paths.patch b/srcpkgs/ghdl/patches/install-paths.patch
index 6575b34ff396..b4ae181fb2cf 100644
--- a/srcpkgs/ghdl/patches/install-paths.patch
+++ b/srcpkgs/ghdl/patches/install-paths.patch
@@ -6,11 +6,11 @@ Author: Andreas Bombe <aeb@debian.org>
 Last-Update: 2020-03-28
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/Makefile.in b/Makefile.in
-index e4923c2..c94853f 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -24,6 +24,7 @@ prefix=@prefix@
+Index: ghdl-2.0.0/Makefile.in
+===================================================================
+--- ghdl-2.0.0.orig/Makefile.in
++++ ghdl-2.0.0/Makefile.in
+@@ -27,6 +27,7 @@ prefix=@prefix@
  backend=@backend@
  libdirsuffix=@libdirsuffix@
  libdirreverse=@libdirreverse@
@@ -18,7 +18,7 @@ index e4923c2..c94853f 100644
  EXEEXT=@EXEEXT@
  SOEXT=@SOEXT@
  PIC_FLAGS=@PIC_FLAGS@
-@@ -46,8 +47,8 @@ INSTALL_DATA=install -m 644
+@@ -49,8 +50,8 @@ INSTALL_DATA=install -m 644
  PWD=$(CURDIR)
  DESTDIR=
  bindir=$(prefix)/bin
@@ -29,7 +29,7 @@ index e4923c2..c94853f 100644
  MKDIR=mkdir
  LN=ln -s
  CP=cp
-@@ -200,7 +201,7 @@ libs.vhdl.mcode: ghdl_mcode$(EXEEXT)
+@@ -210,7 +211,7 @@ libs.vhdl.mcode: ghdl_mcode$(EXEEXT)
  	$(MAKE) -f $(srcdir)/libraries/Makefile.inc $(LIBVHDL_FLAGS_TO_PASS) GHDL=$(PWD)/ghdl_mcode$(EXEEXT) GHDL_FLAGS="" VHDL_COPY_OBJS=no vhdl.libs.all
  
  install.mcode.program: install.dirs ghdl_mcode$(EXEEXT)
@@ -38,7 +38,7 @@ index e4923c2..c94853f 100644
  
  uninstall.mcode.program:
  	$(RM) $(DESTDIR)$(bindir)/ghdl$(EXEEXT)
-@@ -372,8 +373,8 @@ oread-llvm$(EXEEXT): force
+@@ -385,8 +386,8 @@ oread-llvm$(EXEEXT): force
  	 LLVM_CONFIG="$(LLVM_CONFIG)" CXX="$(CXX)"
  
  install.llvm.program: install.dirs ghdl1-llvm$(EXEEXT) ghdl_llvm$(EXEEXT)
@@ -49,28 +49,28 @@ index e4923c2..c94853f 100644
  
  test.llvm: ghdl_llvm$(EXEEXT)
  	cd $(srcdir)/testsuite; GHDL=$(CURDIR)/ghdl_llvm$(EXEEXT) ./testsuite.sh
-diff --git a/configure b/configure
-index 917215a..c1c1a6d 100755
---- a/configure
-+++ b/configure
-@@ -32,6 +32,7 @@ MAKE=${MAKE:-make}
- LDFLAGS=
+Index: ghdl-2.0.0/configure
+===================================================================
+--- ghdl-2.0.0.orig/configure
++++ ghdl-2.0.0/configure
+@@ -34,6 +34,7 @@ MAKE=${MAKE:-make}
+ LDFLAGS=${LDFLAGS:-}
  prefix=/usr/local
  libdirsuffix=lib/ghdl
 +incdirsuffix=include
  libdirreverse=../..
  gcc_src_dir=
  llvm_config=
-@@ -52,7 +53,7 @@ PIC_FLAGS=-fPIC
+@@ -54,7 +55,7 @@ PIC_FLAGS=-fPIC
  show_help=no
  progname=$0
  
--subst_vars="CC CXX GNATMAKE MAKE CFLAGS LDFLAGS build srcdir abs_srcdir prefix backend libdirsuffix libdirreverse gcc_src_dir llvm_config llvm_be backtrace_lib build_mode EXEEXT SOEXT PIC_FLAGS default_pic enable_werror enable_checks enable_gplcompat enable_libghdl libghdl_version ghdl_version"
-+subst_vars="CC CXX GNATMAKE MAKE CFLAGS LDFLAGS build srcdir abs_srcdir prefix backend libdirsuffix libdirreverse incdirsuffix gcc_src_dir llvm_config llvm_be backtrace_lib build_mode EXEEXT SOEXT PIC_FLAGS default_pic enable_werror enable_checks enable_gplcompat enable_libghdl libghdl_version ghdl_version"
+-subst_vars="CC CXX GNATMAKE ADA_FLAGS MAKE CFLAGS CXXFLAGS LDFLAGS build srcdir abs_srcdir prefix backend libdirsuffix libdirreverse gcc_src_dir llvm_config llvm_be backtrace_lib build_mode EXEEXT SOEXT PIC_FLAGS default_pic enable_werror enable_checks enable_gplcompat enable_libghdl libghdl_version ghdl_version"
++subst_vars="CC CXX GNATMAKE ADA_FLAGS MAKE CFLAGS CXXFLAGS LDFLAGS build srcdir abs_srcdir prefix backend libdirsuffix libdirreverse incdirsuffix gcc_src_dir llvm_config llvm_be backtrace_lib build_mode EXEEXT SOEXT PIC_FLAGS default_pic enable_werror enable_checks enable_gplcompat enable_libghdl libghdl_version ghdl_version"
  
  # Find srcdir
  srcdir=`dirname $progname`
-@@ -91,6 +92,8 @@ for opt do
+@@ -93,6 +94,8 @@ for opt do
        ;;
      --prefix=*)             prefix="$optarg";;
      --srcdir=*)             srcdir="$optarg";;
@@ -79,7 +79,7 @@ index 917215a..c1c1a6d 100755
      --with-gcc=*)           gcc_src_dir="$optarg";     backend=gcc;;
      --with-llvm=*)
        echo "--with-llvm is deprecated, use --with-llvm-config"
-@@ -126,6 +129,8 @@ Usage: configure [options]
+@@ -128,6 +131,8 @@ Usage: configure [options]
  Options [defaults in brackets]:
    --prefix=PREFIX             install in PREFIX [$prefix]
    --srcdir=SRCDIR             source code path [$srcdir]
@@ -88,7 +88,7 @@ index 917215a..c1c1a6d 100755
    --with-gcc=DIR              use gcc backend from DIR
    --with-llvm-config[=LLVM-CONFIG]  use llvm backend [llvm-config]
    --with-backtrace-lib=LIB.a  link with libbacktrace LIB.a to display a
-@@ -400,10 +405,11 @@ echo "Generate default_paths.ads"
+@@ -410,10 +415,11 @@ echo "Generate default_paths.ads"
  sed -e "s%@COMPILER_GCC@%ghdl1-gcc$EXEEXT%" \
      -e "s%@COMPILER_DEBUG@%ghdl1-debug$EXEEXT%" \
      -e "s%@COMPILER_MCODE@%ghdl1-mcode$EXEEXT%" \
@@ -101,10 +101,10 @@ index 917215a..c1c1a6d 100755
      -e "s%@SOEXT@%$SOEXT%" \
      -e "s%@default_pic@%$default_pic%" \
      < $srcdir/src/ghdldrv/default_paths.ads.in > default_paths.ads
-diff --git a/scripts/gcc/Make-lang.in b/scripts/gcc/Make-lang.in
-index 108b05b..f9f3b16 100644
---- a/scripts/gcc/Make-lang.in
-+++ b/scripts/gcc/Make-lang.in
+Index: ghdl-2.0.0/scripts/gcc/Make-lang.in
+===================================================================
+--- ghdl-2.0.0.orig/scripts/gcc/Make-lang.in
++++ ghdl-2.0.0/scripts/gcc/Make-lang.in
 @@ -104,7 +104,9 @@ vhdl/default_paths.ads: Makefile
  	echo "   Compiler_Llvm  : constant String := \"\";" >> tmp-dpaths.ads
  	echo "   Post_Processor : constant String := \"\";" >> tmp-dpaths.ads
@@ -127,10 +127,10 @@ index 108b05b..f9f3b16 100644
  	-mkdir $(DESTDIR)$(libdir)
  	-mkdir $(DESTDIR)$(libdir)/ghdl
  	$(INSTALL_DATA) ../libbacktrace/.libs/libbacktrace.a $(DESTDIR)$(libdir)/ghdl
-diff --git a/src/ghdldrv/default_paths.ads.in b/src/ghdldrv/default_paths.ads.in
-index ec6b68d..0b773ce 100644
---- a/src/ghdldrv/default_paths.ads.in
-+++ b/src/ghdldrv/default_paths.ads.in
+Index: ghdl-2.0.0/src/ghdldrv/default_paths.ads.in
+===================================================================
+--- ghdl-2.0.0.orig/src/ghdldrv/default_paths.ads.in
++++ ghdl-2.0.0/src/ghdldrv/default_paths.ads.in
 @@ -23,6 +23,8 @@ package Default_Paths is
       "@INSTALL_PREFIX@";
     Lib_Prefix : constant String :=
@@ -140,20 +140,20 @@ index ec6b68d..0b773ce 100644
  
     Compiler_Gcc : constant String :=
       "@COMPILER_GCC@";
-diff --git a/src/ghdldrv/ghdlvpi.adb b/src/ghdldrv/ghdlvpi.adb
-index 3ecd831..36fdc6f 100644
---- a/src/ghdldrv/ghdlvpi.adb
-+++ b/src/ghdldrv/ghdlvpi.adb
-@@ -37,7 +37,7 @@ package body Ghdlvpi is
-       --  Compute install path
+Index: ghdl-2.0.0/src/ghdldrv/ghdlvpi.adb
+===================================================================
+--- ghdl-2.0.0.orig/src/ghdldrv/ghdlvpi.adb
++++ ghdl-2.0.0/src/ghdldrv/ghdlvpi.adb
+@@ -38,7 +38,7 @@ package body Ghdlvpi is
        Ghdllocal.Set_Exec_Prefix_From_Program_Name;
  
--      return Ghdllocal.Exec_Prefix.all & Directory_Separator & "include";
-+      return Ghdllocal.Exec_Prefix.all & Directory_Separator & Inc_Prefix;
+       return Ghdllocal.Exec_Prefix.all
+-        & Directory_Separator & "include"
++        & Directory_Separator & Inc_Prefix
+         & Directory_Separator & "ghdl";
     end Get_Vpi_Include_Dir;
  
-    --  Return the lib directory.
-@@ -48,7 +48,7 @@ package body Ghdlvpi is
+@@ -50,7 +50,7 @@ package body Ghdlvpi is
           Ghdllocal.Set_Exec_Prefix_From_Program_Name;
        end if;
  
diff --git a/srcpkgs/ghdl/patches/llvm12.patch b/srcpkgs/ghdl/patches/llvm12.patch
deleted file mode 100644
index 8d2f76bfda06..000000000000
--- a/srcpkgs/ghdl/patches/llvm12.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/configure b/configure
-index c1c1a6d..dad7c38 100755
---- a/configure
-+++ b/configure
-@@ -280,6 +280,7 @@ if test $backend = llvm; then
-        check_version  9.0 $llvm_version ||
-        check_version 10.0 $llvm_version ||
-        check_version 11.0 $llvm_version ||
-+       check_version 12.0 $llvm_version ||
-        false; then
-     echo "Debugging is enabled with llvm $llvm_version"
-   else
diff --git a/srcpkgs/ghdl/patches/musl.patch b/srcpkgs/ghdl/patches/musl.patch
index 298fba36ecd1..151aa2155f91 100644
--- a/srcpkgs/ghdl/patches/musl.patch
+++ b/srcpkgs/ghdl/patches/musl.patch
@@ -1,6 +1,8 @@
---- a/src/grt/config/jumps.c
-+++ b/src/grt/config/jumps.c
-@@ -29,7 +29,7 @@
+Index: ghdl-2.0.0/src/grt/config/jumps.c
+===================================================================
+--- ghdl-2.0.0.orig/src/grt/config/jumps.c
++++ ghdl-2.0.0/src/grt/config/jumps.c
+@@ -27,7 +27,7 @@
  #include <signal.h>
  #include <fcntl.h>
  
diff --git a/srcpkgs/ghdl/patches/respect-ldflags.patch b/srcpkgs/ghdl/patches/respect-ldflags.patch
index 61b27c4558aa..b3185915df77 100644
--- a/srcpkgs/ghdl/patches/respect-ldflags.patch
+++ b/srcpkgs/ghdl/patches/respect-ldflags.patch
@@ -1,34 +1,25 @@
 Partially adapted from Debian. Do not ignore LDFLAGS we set.
 We do not want the -g part, as that is handled by xbps-src.
 
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -99,13 +99,14 @@
+Index: ghdl-2.0.0/Makefile.in
+===================================================================
+--- ghdl-2.0.0.orig/Makefile.in
++++ ghdl-2.0.0/Makefile.in
+@@ -112,13 +112,14 @@ target=$(build)
  #target=x86_64-apple-darwin
  #target=i386-pc-mingw32
  
 +SHLIB_FLAGS=$(LDFLAGS)
  ifeq ($(SOEXT),.so)
--SHLIB_FLAGS=-Wl,-soname,$@
-+SHLIB_FLAGS+=-Wl,-soname,$@
+-SHLIB_FLAGS=-Wl,-soname,$(notdir $@)
++SHLIB_FLAGS+=-Wl,-soname,$(notdir $@)
  else ifeq ($(SOEXT),.dll)
 -SHLIB_FLAGS=
 +SHLIB_FLAGS+=
  else ifeq ($(SOEXT),.dylib)
  # Allow the use of -rpath in executable
--SHLIB_FLAGS=-Wl,-install_name,@rpath/$@
-+SHLIB_FLAGS+=-Wl,-install_name,@rpath/$@
+-SHLIB_FLAGS=-Wl,-install_name,@rpath/$(notdir $@)
++SHLIB_FLAGS+=-Wl,-install_name,@rpath/$(notdir $@)
  endif
  
  # Flags for libraries
---- a/configure
-+++ b/configure
-@@ -16,7 +16,7 @@
- CFLAGS=${CFLAGS:--g}
- GNATMAKE=${GNATMAKE:-gnatmake}
- MAKE=${MAKE:-make}
--LDFLAGS=
-+LDFLAGS=${LDFLAGS}
- prefix=/usr/local
- libdirsuffix=lib/ghdl
- incdirsuffix=include
diff --git a/srcpkgs/ghdl/template b/srcpkgs/ghdl/template
index e756d8c3cd87..bf5aeb8609fb 100644
--- a/srcpkgs/ghdl/template
+++ b/srcpkgs/ghdl/template
@@ -6,17 +6,18 @@
 #
 pkgname=ghdl
 reverts="20181129_1"
-version=1.0.0
+version=2.0.0
 revision=1
 build_style=configure
-configure_args="--prefix=/usr --srcdir=.. --incdir=lib/ghdl/include"
+configure_args="--prefix=/usr --srcdir=.. --incdir=lib/ghdl/include
+ --disable-werror"
 makedepends="zlib-devel"
 short_desc="VHDL 2008/93/87 simulator"
 maintainer="m3tav3rse <mtvrs@tuta.io>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ghdl/ghdl"
 distfiles="https://github.com/ghdl/ghdl/archive/v${version}.tar.gz"
-checksum=cb424766fbe831ff41bec84016a6af0406d735c272b0b639d507c3503df30495
+checksum=5f258369e0faf730298916dfdc134c54c25a7a8a7f19722b7ce2717db19af6ec
 nocross=yes
 make_check=extended
 

Re: ghdl: update to 2.0.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 196 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40773#issuecomment-1328063564

Comment:
https://github.com/void-linux/void-packages/pull/40614

Re: [PR PATCH] [Closed]: ghdl: update to 2.0.0.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1103 bytes --]

There's a closed pull request on the void-packages repository

ghdl: update to 2.0.0.
https://github.com/void-linux/void-packages/pull/40773

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

fix build failure

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Re: ghdl: update to 2.0.0.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 187 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/40614#issuecomment-1328243963

Comment:
Please add `--disable-werror` to `configure_args`