From owner-svn-ports-all@freebsd.org Sun Jun 30 20:24:40 2019 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 9B68615DE6E1; Sun, 30 Jun 2019 20:24:40 +0000 (UTC) (envelope-from pi@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 3C9B16E8EE; Sun, 30 Jun 2019 20:24:40 +0000 (UTC) (envelope-from pi@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 293DC297E; Sun, 30 Jun 2019 20:24:40 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5UKOeqj017306; Sun, 30 Jun 2019 20:24:40 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5UKOe9q017305; Sun, 30 Jun 2019 20:24:40 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201906302024.x5UKOe9q017305@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sun, 30 Jun 2019 20:24:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r505480 - head/devel/psptoolchain-gcc-stage1 X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: head/devel/psptoolchain-gcc-stage1 X-SVN-Commit-Revision: 505480 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3C9B16E8EE X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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: Sun, 30 Jun 2019 20:24:40 -0000 Author: pi Date: Sun Jun 30 20:24:39 2019 New Revision: 505480 URL: https://svnweb.freebsd.org/changeset/ports/505480 Log: devel/psptoolchain-gcc-stage1: Fix build conflict - Fix build conflict when texinfo installed and when -march is set in env PR: 233546 Submitted by: Tassilo Philipp (maintainer> Reviewed by: koobs Modified: head/devel/psptoolchain-gcc-stage1/Makefile Modified: head/devel/psptoolchain-gcc-stage1/Makefile ============================================================================== --- head/devel/psptoolchain-gcc-stage1/Makefile Sun Jun 30 20:23:41 2019 (r505479) +++ head/devel/psptoolchain-gcc-stage1/Makefile Sun Jun 30 20:24:39 2019 (r505480) @@ -54,6 +54,11 @@ CONFIGURE_ARGS?= --prefix=${PREFIX}/${PSP_GCC_STAGE_PR --mandir=${PREFIX}/man SSP_CFLAGS?= -fstack-protector # XXX -strong isn't supported by GCC < 4.9 +# make sure xgcc doesn't get any -march=... from env C(XX)?FLAGS (e.g. set by CPUTYPE in make.conf); also "disable" info file gen +CONFIGURE_ENV+= CFLAGS_FOR_TARGET="${CFLAGS:C/(^|[[:space:]])-march=[^[:space:]]*//g}" \ + CXXFLAGS_FOR_TARGET="${CXXFLAGS:C/(^|[[:space:]])-march=[^[:space:]]*//g}" \ + MAKEINFO=true + # Don't install any documentation for psptoolchain's gcc stage 1 - makes no sense. # Disable installation of .info files and libiberty for both stages. post-patch: