Thu Sep 22 11:47:14 2022 UTC ()
ghdl: fix build with llvm 14

Fix pkglint while here.


(wiz)
diff -r1.9 -r1.10 pkgsrc/cad/ghdl/Makefile
diff -r1.6 -r1.7 pkgsrc/cad/ghdl/distinfo
diff -r1.1 -r1.2 pkgsrc/cad/ghdl/patches/patch-configure
cvs diff -r1.9 -r1.10 pkgsrc/cad/ghdl/Makefile (expand / switch to unified diff)

--- pkgsrc/cad/ghdl/Makefile 2022/05/19 16:05:11 1.9
+++ pkgsrc/cad/ghdl/Makefile 2022/09/22 11:47:14 1.10
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1# $NetBSD: Makefile,v 1.9 2022/05/19 16:05:11 ryoon Exp $ 1# $NetBSD: Makefile,v 1.10 2022/09/22 11:47:14 wiz Exp $
2 2
3DISTNAME= ghdl-2.0.0 3DISTNAME= ghdl-2.0.0
4CATEGORIES= cad 4CATEGORIES= cad
5MASTER_SITES= ${MASTER_SITE_GITHUB:=ghdl/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=ghdl/}
6GITHUB_PROJECT= ghdl 6GITHUB_PROJECT= ghdl
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= ryoon@NetBSD.org 9MAINTAINER= ryoon@NetBSD.org
10HOMEPAGE= https://ghdl.github.io/ghdl/ 10HOMEPAGE= https://ghdl.github.io/ghdl/
11COMMENT= Open-source simulator/compiler/analyzer for the VHDL 11COMMENT= Open-source simulator/compiler/analyzer for the VHDL
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_TOOLS+= bash:run gmake 14USE_TOOLS+= bash:run gmake
15 15
16USE_LANGUAGES+= c c++ # ada 16USE_LANGUAGES+= c c++ # ada
17 17
18# lang/gcc10-aux does not support RELRO 18# lang/gcc10-aux does not support RELRO
19# and this package should use same condition. 19# and this package should use same condition.
20RELRO_SUPPORTED= no 20RELRO_SUPPORTED= no
21MKPIE_SUPPORTED= no 21MKPIE_SUPPORTED= no
22 22
23REPLACE_BASH= scripts/vendors/*.sh 23REPLACE_BASH= scripts/vendors/*.sh
24## This approach to use __time50() and __ctime50() is unavailable 24## This approach to use __time50() and __ctime50() is unavailable
25## because Ada language would not accept symbols start with '_'. 25## because Ada language would not accept symbols start with '_'.
26#.include "../../mk/bsd.prefs.mk" 26#.include "../../mk/bsd.prefs.mk"
27#.if ${OPSYS} == "NetBSD" 27#.if ${OPSYS} == "NetBSD"
28#SUBST_CLASSES+= time 28#SUBST_CLASSES+= time
29#SUBST_STAGE.time= pre-configure 29#SUBST_STAGE.time= pre-configure
30#SUBST_MESSAGE.time= Use correct functions in time.h 30#SUBST_MESSAGE.time= Use correct functions in time.h
31#SUBST_FILES.time+= src/grt/grt-vcd.adb 31#SUBST_FILES.time+= src/grt/grt-vcd.adb
32#SUBST_SED.time+= -e 's/pragma Import (C, time);/pragma Import (C, __time50);/g' 32#SUBST_SED.time+= -e 's/pragma Import (C, time);/pragma Import (C, __time50);/g'
33#SUBST_SED.time+= -e 's/pragma Import (C, ctime);/pragma Import (C, __ctime50);/g' 33#SUBST_SED.time+= -e 's/pragma Import (C, ctime);/pragma Import (C, __ctime50);/g'
34#.endif 34#.endif
35 35
36HAS_CONFIGURE= yes 36HAS_CONFIGURE= yes
37CONFIGURE_ENV+= GNATMAKE=${PREFIX}/gcc10-aux/bin/gnatmake 37CONFIGURE_ENV+= GNATMAKE=${PREFIX}/gcc10-aux/bin/gnatmake
38CONFIGURE_ARGS+= --prefix=${PREFIX} 38CONFIGURE_ARGS+= --prefix=${PREFIX}
39CONFIGURE_ARGS+= --enable-synth 39CONFIGURE_ARGS+= --enable-synth
40CONFIGURE_ARGS+= --enable-libghdl 40CONFIGURE_ARGS+= --enable-libghdl
41# Select LLVM backend 41# Select LLVM backend
cvs diff -r1.6 -r1.7 pkgsrc/cad/ghdl/distinfo (expand / switch to unified diff)

--- pkgsrc/cad/ghdl/distinfo 2022/05/19 16:05:11 1.6
+++ pkgsrc/cad/ghdl/distinfo 2022/09/22 11:47:14 1.7
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.6 2022/05/19 16:05:11 ryoon Exp $ 1$NetBSD: distinfo,v 1.7 2022/09/22 11:47:14 wiz Exp $
2 2
3BLAKE2s (ghdl-2.0.0.tar.gz) = a3297be935cd7a25f9003810c2a0895162ac3ead5d83fe61b4b15fac1ff415d8 3BLAKE2s (ghdl-2.0.0.tar.gz) = a3297be935cd7a25f9003810c2a0895162ac3ead5d83fe61b4b15fac1ff415d8
4SHA512 (ghdl-2.0.0.tar.gz) = f4474a7916f9cc5cce976d0b4620d1441c377d72b749867b170397bf62d534983b37d4fc9bb31ef85e40eb7beb9b3a681a7ac32931f665934b357e97e74be6da 4SHA512 (ghdl-2.0.0.tar.gz) = f4474a7916f9cc5cce976d0b4620d1441c377d72b749867b170397bf62d534983b37d4fc9bb31ef85e40eb7beb9b3a681a7ac32931f665934b357e97e74be6da
5Size (ghdl-2.0.0.tar.gz) = 6825565 bytes 5Size (ghdl-2.0.0.tar.gz) = 6825565 bytes
6SHA1 (patch-configure) = 6dc7a5240c3ba00be232472d1c0c417e97531fe1 6SHA1 (patch-configure) = fc358c33df2272a0bfaab9fbe334f24365da149b
7SHA1 (patch-src_ortho_mcode_memsegs__c.c) = 5669dda0130ade50caf7538c3f2c6cfed061ac5b 7SHA1 (patch-src_ortho_mcode_memsegs__c.c) = 5669dda0130ade50caf7538c3f2c6cfed061ac5b
cvs diff -r1.1 -r1.2 pkgsrc/cad/ghdl/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/cad/ghdl/patches/patch-configure 2022/05/19 16:05:12 1.1
+++ pkgsrc/cad/ghdl/patches/patch-configure 2022/09/22 11:47:14 1.2
@@ -1,14 +1,24 @@ @@ -1,14 +1,24 @@
1$NetBSD: patch-configure,v 1.1 2022/05/19 16:05:12 ryoon Exp $ 1$NetBSD: patch-configure,v 1.2 2022/09/22 11:47:14 wiz Exp $
2 2
 3* Support llvm 14 & 15.
3* Support NetBSD for mcode backend. (not used) 4* Support NetBSD for mcode backend. (not used)
4 5
5--- configure.orig 2022-02-28 18:46:53.000000000 +0000 6--- configure.orig 2022-02-28 18:46:53.000000000 +0000
6+++ configure 7+++ configure
7@@ -379,6 +379,7 @@ if test $backend = mcode; then 8@@ -281,6 +281,8 @@ if test $backend = llvm; then
 9 check_version 11.1 $llvm_version ||
 10 check_version 12.0 $llvm_version ||
 11 check_version 13.0 $llvm_version ||
 12+ check_version 14.0 $llvm_version ||
 13+ check_version 15.0 $llvm_version ||
 14 false; then
 15 echo "Debugging is enabled with llvm $llvm_version"
 16 else
 17@@ -379,6 +381,7 @@ if test $backend = mcode; then
8 *mingw32*) ortho_flags="Flags_Windows${mcode64}" ;; 18 *mingw32*) ortho_flags="Flags_Windows${mcode64}" ;;
9 *linux*) ortho_flags="Flags_Linux${mcode64}" ;; 19 *linux*) ortho_flags="Flags_Linux${mcode64}" ;;
10 *openbsd*) ortho_flags="Flags_Macosx${mcode64}" ;; 20 *openbsd*) ortho_flags="Flags_Macosx${mcode64}" ;;
11+ *netbsd*) ortho_flags="Flags_Macosx${mcode64}" ;; 21+ *netbsd*) ortho_flags="Flags_Macosx${mcode64}" ;;
12 *) echo "Unsupported $build build for mcode"; exit 1;; 22 *) echo "Unsupported $build build for mcode"; exit 1;;
13 esac 23 esac
14 echo "Generate ortho_code-x86-flags.ads" 24 echo "Generate ortho_code-x86-flags.ads"