From owner-svn-ports-all@freebsd.org Fri Nov 9 18:24:50 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 14D671103EEE; Fri, 9 Nov 2018 18:24:50 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 405A287449; Fri, 9 Nov 2018 18:24:49 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1354) id 2EE8D7B09; Fri, 9 Nov 2018 18:24:49 +0000 (UTC) From: Jan Beich To: Steve Wills Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r484532 - in head/devel/yosys: . files References: <201811091731.wA9HVvr5094957@repo.freebsd.org> Date: Fri, 09 Nov 2018 19:24:45 +0100 In-Reply-To: <201811091731.wA9HVvr5094957@repo.freebsd.org> (Steve Wills's message of "Fri, 9 Nov 2018 17:31:57 +0000 (UTC)") Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-Rspamd-Queue-Id: 405A287449 X-Spamd-Result: default: False [-106.84 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[freebsd.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; R_SPF_SOFTFAIL(0.00)[~all]; IP_SCORE(-3.73)[ip: (-9.76), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.87), country: US(-0.09)]; MX_GOOD(-0.01)[cached: mx66.freebsd.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Nov 2018 18:24:50 -0000 Steve Wills writes: > @@ -30,7 +29,19 @@ GH_TAGNAME= bab39eacce5c17c42d50a3a60a67cc8a9ee52d98 > BINARY_ALIAS= python3=${PYTHON_CMD} tclsh=${TCLSH} > MAKE_ARGS= ABCEXTERNAL=abc > > +.include > + > +.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 > + Looks more complicated than necessary. Try my patch at the end. > + else ifeq ($(CONFIG),gcc) > +-CXX = gcc > ++CXX = g++%%GCC_DEFAULT%% > + LD = gcc gcc refers to /usr/bin/gcc unless lang/gcc is installed. USE_GCC implied by USES=compiler:c++11-lang doesn't pull lang/gcc nor adjust PATH. Index: devel/yosys/Makefile =================================================================== --- devel/yosys/Makefile (revision 484532) +++ devel/yosys/Makefile (working copy) @@ -29,19 +29,12 @@ GH_TAGNAME= bab39eacce5c17c42d50a3a60a67cc8a9ee52d BINARY_ALIAS= python3=${PYTHON_CMD} tclsh=${TCLSH} MAKE_ARGS= ABCEXTERNAL=abc -.include - -.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}|' \ + ${REINPLACE_CMD} -e '/^CXX =/d; s/^LD = .*/LD = $$(CXX)/' \ + -e '/^CONFIG/s/clang/${CHOSEN_COMPILER_TYPE}/' \ ${WRKSRC}/Makefile -.endif post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/yosys -.include +.include Index: devel/yosys/files/extra-patch-Makefile =================================================================== --- devel/yosys/files/extra-patch-Makefile (revision 484532) +++ devel/yosys/files/extra-patch-Makefile (nonexistent) @@ -1,23 +0,0 @@ ---- 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