ghdl-dev: upgrade to recent nightly, 2 patches accepted by upstream removed, added 1 new patch and reported upstream

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: ghdl-dev: upgrade to recent nightly, 2 patches accepted by upstream removed, added 1 new patch and reported upstream
From: Mayuresh (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Mon, 27 Jan 2025 15:53:01 +0000

Module Name:	pkgsrc-wip
Committed By:	Mayuresh <mayuresh%acm.org@localhost>
Pushed By:	mayuresh
Date:		Mon Jan 27 21:21:22 2025 +0530
Changeset:	ce53f842c31f83e6cb9a816101d634f4a7a33b77

Modified Files:
	ghdl-dev/Makefile
	ghdl-dev/distinfo
Added Files:
	ghdl-dev/patches/patch-Makefile.in
Removed Files:
	ghdl-dev/patches/patch-configure
	ghdl-dev/patches/patch-src_ortho_mcode_memsegs__c.c

Log Message:
ghdl-dev: upgrade to recent nightly, 2 patches accepted by upstream removed, added 1 new patch and reported upstream

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ce53f842c31f83e6cb9a816101d634f4a7a33b77

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

diffstat:
 ghdl-dev/Makefile                                   | 12 ++++++------
 ghdl-dev/distinfo                                   |  9 ++++-----
 ghdl-dev/patches/patch-Makefile.in                  | 15 +++++++++++++++
 ghdl-dev/patches/patch-configure                    | 15 ---------------
 ghdl-dev/patches/patch-src_ortho_mcode_memsegs__c.c | 16 ----------------
 5 files changed, 25 insertions(+), 42 deletions(-)

diffs:
diff --git a/ghdl-dev/Makefile b/ghdl-dev/Makefile
index 530501b144..7d428772ce 100644
--- a/ghdl-dev/Makefile
+++ b/ghdl-dev/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD$
 
-GITHUB_PROJECT=	ghdl
-GITHUB_TAG=	f1de234f5e77eb8fb765da945a0bf34ec4abb864
-DISTNAME=	f1de234f5e77eb8fb765da945a0bf34ec4abb864
-PKGNAME=	${GITHUB_PROJECT}-dev-5.0.0.9655
+DISTNAME=	d0ca8b657482bbdad1e8196a2a58cc3c7e8f8f8a
+PKGNAME=	${GITHUB_PROJECT}-dev-5.0.0.9860
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ghdl/}
+GITHUB_PROJECT=	ghdl
+GITHUB_TAG=	d0ca8b657482bbdad1e8196a2a58cc3c7e8f8f8a
 DIST_SUBDIR=	${GITHUB_PROJECT}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
@@ -33,10 +33,10 @@ PLIST_VARS+=	llvm
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} != "Linux"
-TOOL_DEPENDS+=	gcc10-aux-[0-9]*:../../lang/gcc10-aux
-CONFIGURE_ENV+=		GNATMAKE=${PREFIX}/gcc10-aux/bin/gnatmake
+CONFIGURE_ENV+=	GNATMAKE=${PREFIX}/gcc10-aux/bin/gnatmake
 CONFIGURE_ARGS+=	--with-llvm-config=${PREFIX}/bin/llvm-config
 BUILDLINK_DEPMETHOD.clang=	build
+.include "../../lang/gcc10-aux/buildlink3.mk"
 .include "../../lang/clang/buildlink3.mk"
 .include "../../lang/llvm/buildlink3.mk"
 PLIST.llvm=	yes
diff --git a/ghdl-dev/distinfo b/ghdl-dev/distinfo
index 3aad6476cf..30c14f6478 100644
--- a/ghdl-dev/distinfo
+++ b/ghdl-dev/distinfo
@@ -1,7 +1,6 @@
 $NetBSD$
 
-BLAKE2s (ghdl/f1de234f5e77eb8fb765da945a0bf34ec4abb864-f1de234f5e77eb8fb765da945a0bf34ec4abb864.tar.gz) = 8805e151aa3f69bf17729df932dbee34e2cb7362b06bc36b4b3954b8f825ec7a
-SHA512 (ghdl/f1de234f5e77eb8fb765da945a0bf34ec4abb864-f1de234f5e77eb8fb765da945a0bf34ec4abb864.tar.gz) = 401da68b303ec2e0ee2418f4f92d2dd921fec398fd0eba3ba1aa9351c525321ceb6b251142ee666a35e25bf5cd685a9fd12ceb79996ce7bb07a1853db674cc67
-Size (ghdl/f1de234f5e77eb8fb765da945a0bf34ec4abb864-f1de234f5e77eb8fb765da945a0bf34ec4abb864.tar.gz) = 7798367 bytes
-SHA1 (patch-configure) = 380801b725b783fdea91174baa3320823a956bf5
-SHA1 (patch-src_ortho_mcode_memsegs__c.c) = b3cbfaf4f5cd099cca1688add2954d64cae9ac66
+BLAKE2s (ghdl/d0ca8b657482bbdad1e8196a2a58cc3c7e8f8f8a-d0ca8b657482bbdad1e8196a2a58cc3c7e8f8f8a.tar.gz) = d76f2b50717d710235e9ba509f009b6fb1be7fd54b6ba3d9d2caeff68d965e99
+SHA512 (ghdl/d0ca8b657482bbdad1e8196a2a58cc3c7e8f8f8a-d0ca8b657482bbdad1e8196a2a58cc3c7e8f8f8a.tar.gz) = 6fd857c8bec19f4c61d531311280ba8882caef632f501b9eb352c8ae67e6caed4244c1ff54b98bf1edb565c1dc824e611c49e7b116402a9caaad63574ad9fe14
+Size (ghdl/d0ca8b657482bbdad1e8196a2a58cc3c7e8f8f8a-d0ca8b657482bbdad1e8196a2a58cc3c7e8f8f8a.tar.gz) = 7806958 bytes
+SHA1 (patch-Makefile.in) = c38b1ce2954a6f4ed44b1d85f11db18919924017
diff --git a/ghdl-dev/patches/patch-Makefile.in b/ghdl-dev/patches/patch-Makefile.in
new file mode 100644
index 0000000000..32157a5bd4
--- /dev/null
+++ b/ghdl-dev/patches/patch-Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD$
+
+https://github.com/ghdl/ghdl/issues/2806
+
+--- Makefile.in.orig	2025-01-27 15:31:00.587990254 +0000
++++ Makefile.in
+@@ -485,7 +485,7 @@ LIBGHDL_GRT_OBJS= pic/grt-cstdio.o pic/g
+ lib/$(libghdl_name): $(GRT_SRC_DEPS) $(LIBGHDL_GRT_OBJS) version.ads force
+ #	Use -g for gnatlink so that the binder file is not removed.  We need
+ #	it for libghdl.a
+-	$(GNATMAKE) -I- -aI. -D pic -z libghdl -o $@ -gnat12 $(GNATFLAGS) $(PIC_FLAGS) $(LIBGHDL_INCFLAGS) -bargs -shared -Llibghdl_ -largs -R -g -shared $(SHLIB_FLAGS) $(filter-out -static,$(LDFLAGS)) $(LIBGHDL_GRT_OBJS)
++	$(GNATMAKE) -I- -aI. -D pic -z libghdl -o $@ -gnat12 $(GNATFLAGS) $(PIC_FLAGS) $(LIBGHDL_INCFLAGS) -bargs -shared -Llibghdl_ -largs -g -shared $(SHLIB_FLAGS) $(filter-out -static,$(LDFLAGS)) $(LIBGHDL_GRT_OBJS)
+ #       On windows, gnatmake (via Osint.Executable_Name) always appends .exe
+ #       Adjust.  (Other solution: use gnatmake for compilation and binding,
+ #       then use gnatlink directly for linking).
diff --git a/ghdl-dev/patches/patch-configure b/ghdl-dev/patches/patch-configure
deleted file mode 100644
index 0853fbb84c..0000000000
--- a/ghdl-dev/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-* Support NetBSD for mcode backend.
-https://github.com/ghdl/ghdl/issues/2797
-
---- configure.orig	2024-11-17 09:54:17.000000000 +0000
-+++ configure
-@@ -438,6 +438,7 @@ if test $backend = mcode; then
-     *mingw32*) ortho_flags="Flags_Windows${mcode64}" ;;
-     *linux*)   ortho_flags="Flags_Linux${mcode64}" ;;
-     *openbsd*) ortho_flags="Flags_Macosx${mcode64}" ;;
-+    *netbsd*) ortho_flags="Flags_Macosx${mcode64}" ;;
-     *) echo "Unsupported $build build for mcode"; exit 1;;
-   esac
-   echo "Generate ortho_code-x86-flags.ads"
diff --git a/ghdl-dev/patches/patch-src_ortho_mcode_memsegs__c.c b/ghdl-dev/patches/patch-src_ortho_mcode_memsegs__c.c
deleted file mode 100644
index 65405ac813..0000000000
--- a/ghdl-dev/patches/patch-src_ortho_mcode_memsegs__c.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-* Support NetBSD for mcode backend.
-https://github.com/ghdl/ghdl/issues/2797
-
---- src/ortho/mcode/memsegs_c.c.orig	2024-11-18 10:40:25.368626207 +0000
-+++ src/ortho/mcode/memsegs_c.c
-@@ -28,6 +28,8 @@
- 
- #if defined(__APPLE__) || defined(__OpenBSD__)
- #define MAP_ANONYMOUS MAP_ANON
-+#elif defined(__NetBSD__)
-+/* nothing */
- #else
- #define HAVE_MREMAP
- #endif

Prev by Date: megacmd: remove, merged
Next by Date: ghdl-dev: patch comment updated to reflect new issue report instead of comment on old closed issue
Previous by Thread: megacmd: remove, merged
Next by Thread: ghdl-dev: patch comment updated to reflect new issue report instead of comment on old closed issue
Indexes:

Home | Main Index | Thread Index | Old Index