From owner-svn-ports-head@freebsd.org Thu Jun 13 12:53:21 2019 Return-Path: Delivered-To: svn-ports-head@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 1496715B152F; Thu, 13 Jun 2019 12:53:21 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AFDDE83975; Thu, 13 Jun 2019 12:53:20 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 876BA908; Thu, 13 Jun 2019 12:53:20 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5DCrKok077568; Thu, 13 Jun 2019 12:53:20 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5DCrK4P077567; Thu, 13 Jun 2019 12:53:20 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <201906131253.x5DCrK4P077567@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Thu, 13 Jun 2019 12:53:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r504088 - head/devel/gn X-SVN-Group: ports-head X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: head/devel/gn X-SVN-Commit-Revision: 504088 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: AFDDE83975 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.95)[-0.952,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Jun 2019 12:53:21 -0000 Author: linimon Date: Thu Jun 13 12:53:20 2019 New Revision: 504088 URL: https://svnweb.freebsd.org/changeset/ports/504088 Log: Fix hardwired assumption that FreeBSD implies clang to fix build on GCC-based systems. It wasn't clear to me how to pass environment variables to build/gen.py, so this change seemed more straightforward. Approved by: portmgr (tier-2 blanket) Modified: head/devel/gn/Makefile Modified: head/devel/gn/Makefile ============================================================================== --- head/devel/gn/Makefile Thu Jun 13 12:50:04 2019 (r504087) +++ head/devel/gn/Makefile Thu Jun 13 12:53:20 2019 (r504088) @@ -27,9 +27,16 @@ CONFIGURE_ARGS= --platform freebsd ${WITH_DEBUG:D--deb ALL_TARGET= # empty PLIST_FILES= bin/${PORTNAME} +.include + post-patch: @${REINPLACE_CMD} 's/"python"/"${PYTHON_CMD:T}"/' \ ${WRKSRC}/tools/gn/exec_process_unittest.cc +# fix hardwired assumption that FreeBSD implies clang +.if ${CHOSEN_COMPILER_TYPE} == gcc + @${REINPLACE_CMD} 's/clang/gcc/' \ + ${WRKSRC}/build/gen.py +.endif do-install: ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin @@ -37,4 +44,4 @@ do-install: do-test: ${TEST_WRKSRC}/gn_unittests -.include +.include