CVS commit: pkgsrc/cad/ghdl

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Sep 22 11:47:14 UTC 2022

Modified Files:
        pkgsrc/cad/ghdl: Makefile distinfo
        pkgsrc/cad/ghdl/patches: patch-configure

Log Message:
ghdl: fix build with llvm 14

Fix pkglint while here.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/cad/ghdl/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/cad/ghdl/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/cad/ghdl/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/cad/ghdl/Makefile
diff -u pkgsrc/cad/ghdl/Makefile:1.9 pkgsrc/cad/ghdl/Makefile:1.10
--- pkgsrc/cad/ghdl/Makefile:1.9        Thu May 19 16:05:11 2022
+++ pkgsrc/cad/ghdl/Makefile    Thu Sep 22 11:47:14 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2022/05/19 16:05:11 ryoon Exp $
+# $NetBSD: Makefile,v 1.10 2022/09/22 11:47:14 wiz Exp $
 
 DISTNAME=      ghdl-2.0.0
 CATEGORIES=    cad
@@ -25,7 +25,7 @@ REPLACE_BASH=         scripts/vendors/*.sh
 ## because Ada language would not accept symbols start with '_'.
 #.include "../../mk/bsd.prefs.mk"
 #.if ${OPSYS} == "NetBSD"
-#SUBST_CLASSES+=               time
+#SUBST_CLASSES+=       time
 #SUBST_STAGE.time=     pre-configure
 #SUBST_MESSAGE.time=   Use correct functions in time.h
 #SUBST_FILES.time+=    src/grt/grt-vcd.adb

Index: pkgsrc/cad/ghdl/distinfo
diff -u pkgsrc/cad/ghdl/distinfo:1.6 pkgsrc/cad/ghdl/distinfo:1.7
--- pkgsrc/cad/ghdl/distinfo:1.6        Thu May 19 16:05:11 2022
+++ pkgsrc/cad/ghdl/distinfo    Thu Sep 22 11:47:14 2022
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2022/05/19 16:05:11 ryoon Exp $
+$NetBSD: distinfo,v 1.7 2022/09/22 11:47:14 wiz Exp $
 
 BLAKE2s (ghdl-2.0.0.tar.gz) = a3297be935cd7a25f9003810c2a0895162ac3ead5d83fe61b4b15fac1ff415d8
 SHA512 (ghdl-2.0.0.tar.gz) = f4474a7916f9cc5cce976d0b4620d1441c377d72b749867b170397bf62d534983b37d4fc9bb31ef85e40eb7beb9b3a681a7ac32931f665934b357e97e74be6da
 Size (ghdl-2.0.0.tar.gz) = 6825565 bytes
-SHA1 (patch-configure) = 6dc7a5240c3ba00be232472d1c0c417e97531fe1
+SHA1 (patch-configure) = fc358c33df2272a0bfaab9fbe334f24365da149b
 SHA1 (patch-src_ortho_mcode_memsegs__c.c) = 5669dda0130ade50caf7538c3f2c6cfed061ac5b

Index: pkgsrc/cad/ghdl/patches/patch-configure
diff -u pkgsrc/cad/ghdl/patches/patch-configure:1.1 pkgsrc/cad/ghdl/patches/patch-configure:1.2
--- pkgsrc/cad/ghdl/patches/patch-configure:1.1 Thu May 19 16:05:12 2022
+++ pkgsrc/cad/ghdl/patches/patch-configure     Thu Sep 22 11:47:14 2022
@@ -1,10 +1,20 @@
-$NetBSD: patch-configure,v 1.1 2022/05/19 16:05:12 ryoon Exp $
+$NetBSD: patch-configure,v 1.2 2022/09/22 11:47:14 wiz Exp $
 
+* Support llvm 14 & 15.
 * Support NetBSD for mcode backend. (not used)
 
 --- configure.orig     2022-02-28 18:46:53.000000000 +0000
 +++ configure
-@@ -379,6 +379,7 @@ if test $backend = mcode; then
+@@ -281,6 +281,8 @@ if test $backend = llvm; then
+        check_version 11.1 $llvm_version ||
+        check_version 12.0 $llvm_version ||
+        check_version 13.0 $llvm_version ||
++       check_version 14.0 $llvm_version ||
++       check_version 15.0 $llvm_version ||
+        false; then
+     echo "Debugging is enabled with llvm $llvm_version"
+   else
+@@ -379,6 +381,7 @@ if test $backend = mcode; then
      *mingw32*) ortho_flags="Flags_Windows${mcode64}" ;;
      *linux*)   ortho_flags="Flags_Linux${mcode64}" ;;
      *openbsd*) ortho_flags="Flags_Macosx${mcode64}" ;;