From 783f2a31a62270973879acb79992e961669f56e1 Mon Sep 17 00:00:00 2001
From: John Marino <marino@FreeBSD.org>
Date: Tue, 2 Jun 2015 22:15:48 +0000
Subject: cad/ghdl: Support DragonFly - llvm back now jobs safe

The LLVM backend passes *all* tests on DragonFly (unlike FreeBSD which
fails at test 825)
---
 cad/ghdl/Makefile                         |  4 ++--
 cad/ghdl/distinfo                         |  4 ++--
 cad/ghdl/files/patch-src_grt_Makefile.inc | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 cad/ghdl/files/patch-src_grt_Makefile.inc

(limited to 'cad/ghdl')

diff --git a/cad/ghdl/Makefile b/cad/ghdl/Makefile
index bfa97a4b5e4a..ecbcd2aed409 100644
--- a/cad/ghdl/Makefile
+++ b/cad/ghdl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ghdl
 PORTVERSION=	0.32
+PORTREVISION=	1
 CATEGORIES=	cad
 DISTFILES=	${SRCDISTFILE} ${GCCDISTFILE}
 
@@ -20,7 +21,7 @@ USES=		ada gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	hanzer
 GH_PROJECT=	GHDL
-GH_TAGNAME=	a88ac1c
+GH_TAGNAME=	47ee186
 
 GNU_CONFIGURE=	yes
 GCCVER=		4.9.2
@@ -110,7 +111,6 @@ BUILD_DEPENDS+=	llvm-config${LLVMVER}:${PORTSDIR}/devel/llvm${LLVMVER} \
 RUN_DEPENDS+=	llc${LLVMVER}:${PORTSDIR}/devel/llvm${LLVMVER}
 PLIST=		${.CURDIR}/llvm-plist
 PLIST_SUB+=	GLIB=ghdl/lib/ghdl/
-MAKE_JOBS_UNSAFE=	yes
 .endif
 
 post-patch:
diff --git a/cad/ghdl/distinfo b/cad/ghdl/distinfo
index b8427c44c5c6..49414353777c 100644
--- a/cad/ghdl/distinfo
+++ b/cad/ghdl/distinfo
@@ -1,4 +1,4 @@
-SHA256 (hanzer-GHDL-0.32-a88ac1c_GH0.tar.gz) = 8f2d7f953ee6e0a34ec1f51308ce2fa694ce6776a3154184591ebe690d45eed9
-SIZE (hanzer-GHDL-0.32-a88ac1c_GH0.tar.gz) = 3081221
+SHA256 (hanzer-GHDL-0.32-47ee186_GH0.tar.gz) = e552f340223ad7cd9680d91bd8caff611950382364f5eb098de0a65d58ea6911
+SIZE (hanzer-GHDL-0.32-47ee186_GH0.tar.gz) = 3081814
 SHA256 (gcc-4.9.2.tar.bz2) = 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd
 SIZE (gcc-4.9.2.tar.bz2) = 89939747
diff --git a/cad/ghdl/files/patch-src_grt_Makefile.inc b/cad/ghdl/files/patch-src_grt_Makefile.inc
new file mode 100644
index 000000000000..174e72fa59a1
--- /dev/null
+++ b/cad/ghdl/files/patch-src_grt_Makefile.inc
@@ -0,0 +1,14 @@
+--- src/grt/Makefile.inc.orig	2015-06-01 05:56:40 UTC
++++ src/grt/Makefile.inc
+@@ -71,6 +71,11 @@ ifeq ($(filter-out x86_64 freebsd%,$(arc
+   GRT_EXTRA_LIB=-lm $(GRT_ELF_OPTS)
+   ADAC=ada
+ endif
++ifeq ($(filter-out x86_64 dragonfly%,$(arch) $(osys)),)
++  GRT_TARGET_OBJS=amd64.o linux.o times.o
++  GRT_EXTRA_LIB=-lm $(GRT_ELF_OPTS)
++  ADAC=ada
++endif
+ ifeq ($(filter-out i%86 darwin%,$(arch) $(osys)),)
+   GRT_TARGET_OBJS=i386.o linux.o times.o
+   GRT_EXTRA_LIB=
-- 
cgit v1.2.3