Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 9 Nov 2018 17:31:57 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r484532 - in head/devel/yosys: . files
Message-ID:  <201811091731.wA9HVvr5094957@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Fri Nov  9 17:31:57 2018
New Revision: 484532
URL: https://svnweb.freebsd.org/changeset/ports/484532

Log:
  devel/yosys: fix build with GCC-based architectures
  
  PR:		232650
  Submitted by:	Piotr Kubaj <pkubaj@anongoth.pl>
  Approved by:	maintainer timeout (jsorocil@gmail.com, >2 weeks)

Added:
  head/devel/yosys/files/
  head/devel/yosys/files/extra-patch-Makefile   (contents, props changed)
Modified:
  head/devel/yosys/Makefile   (contents, props changed)

Modified: head/devel/yosys/Makefile
==============================================================================
--- head/devel/yosys/Makefile	Fri Nov  9 17:00:48 2018	(r484531)
+++ head/devel/yosys/Makefile	Fri Nov  9 17:31:57 2018	(r484532)
@@ -12,14 +12,13 @@ COMMENT=	Yosys Open SYnthesis Suite
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_powerpc64=	fails to build: /bin/sh: clang: not found
-
 BUILD_DEPENDS=	abc:cad/abc \
 		bash:shells/bash \
 		gawk:lang/gawk
 LIB_DEPENDS=	libffi.so:devel/libffi
 
-USES=		bison gmake pkgconfig python:3.6+ readline shebangfix tcl
+USES=		bison compiler:c++11-lang gmake pkgconfig python:3.6+ readline \
+		shebangfix tcl
 SHEBANG_FILES=	backends/smt2/smtbmc.py \
 		misc/yosys-config.in
 
@@ -30,7 +29,19 @@ GH_TAGNAME=	bab39eacce5c17c42d50a3a60a67cc8a9ee52d98
 BINARY_ALIAS=	python3=${PYTHON_CMD} tclsh=${TCLSH}
 MAKE_ARGS=	ABCEXTERNAL=abc
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-Makefile
+.endif
+
+post-patch:
+.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
+	${REINPLACE_CMD} -e 's|%%GCC_DEFAULT%%|${GCC_DEFAULT}|' \
+		${WRKSRC}/Makefile
+.endif
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/yosys
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Added: head/devel/yosys/files/extra-patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/yosys/files/extra-patch-Makefile	Fri Nov  9 17:31:57 2018	(r484532)
@@ -0,0 +1,23 @@
+--- Makefile.orig	2018-05-13 11:27:14 UTC
++++ Makefile
+@@ -1,6 +1,6 @@
+ 
+-CONFIG := clang
+-# CONFIG := gcc
++# CONFIG := clang
++CONFIG := gcc
+ # CONFIG := gcc-4.8
+ # CONFIG := emcc
+ # CONFIG := mxe
+@@ -145,9 +145,9 @@ endif
+ endif
+ 
+ else ifeq ($(CONFIG),gcc)
+-CXX = gcc
++CXX = g++%%GCC_DEFAULT%%
+ LD = gcc
+-CXXFLAGS += -std=c++11 -Os
++CXXFLAGS += -std=c++11
+ 
+ else ifeq ($(CONFIG),gcc-4.8)
+ CXX = gcc-4.8



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811091731.wA9HVvr5094957>