From owner-svn-ports-all@freebsd.org Sun Feb 12 15:55:10 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 63397CDB9EE; Sun, 12 Feb 2017 15:55:10 +0000 (UTC) (envelope-from rezny@freebsd.org) Received: from mail.modirum.com (mail.modirum.com [31.185.27.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2A454111C; Sun, 12 Feb 2017 15:55:10 +0000 (UTC) (envelope-from rezny@freebsd.org) Received: by mail.modirum.com with esmtpsa (TLSv1:ECDHE-RSA-AES256-SHA:256) (Exim 4.87 (FreeBSD)) (envelope-from ) id 1ccwUQ-00016q-9j; Sun, 12 Feb 2017 15:55:02 +0000 From: Matthew Rezny To: Guido Falsi , ports-committers@freebsd.org Cc: svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r433897 - in head: graphics/libGL/files graphics/libdrm/files x11-servers/xorg-server/files Date: Sun, 12 Feb 2017 16:54:58 +0100 Message-ID: <1857950.nVBdKmjNo2@workstation.reztek> Organization: FreeBSD User-Agent: KMail/4.14.10 (FreeBSD/11.0-STABLE; KDE/4.14.10; amd64; ; ) In-Reply-To: <6ac0c251-a458-9470-4d20-fecdbeb384ae@FreeBSD.org> References: <201702111745.v1BHj0gJ088130@repo.freebsd.org> <20170211204451.5b77ac7d@kalimero.tijl.coosemans.org> <6ac0c251-a458-9470-4d20-fecdbeb384ae@FreeBSD.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-SA-Authenticated: Yes X-SA-Exim-Connect-IP: 94.142.238.108 X-SA-Exim-Mail-From: rezny@freebsd.org X-SA-Exim-Scanned: No (on mail.modirum.com); SAEximRunCond expanded to false X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 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, 12 Feb 2017 15:55:10 -0000 On Saturday 11 February 2017 23:16:45 Guido Falsi wrote: > On 02/11/17 20:44, Tijl Coosemans wrote: > > On Sat, 11 Feb 2017 17:45:00 +0000 (UTC) Matthew Rezny wrote: > >> Author: rezny > >> Date: Sat Feb 11 17:44:59 2017 > >> New Revision: 433897 > >> URL: https://svnweb.freebsd.org/changeset/ports/433897 > >> > >> Log: > >> Remove post-patch cruft accidentally introduced into patch-configure > >> files > >> with the previous commit. Thanks to tijl for noticing what I > >> overlooked. > >> > >> Approved by: swills (mentor) > >> Differential Revision: https://reviews.freebsd.org/D9544 > >> > >> Modified: > >> head/graphics/libGL/files/patch-configure > >> head/graphics/libdrm/files/patch-configure > >> head/x11-servers/xorg-server/files/patch-configure > >> > >> Modified: head/graphics/libGL/files/patch-configure > >> ========================================================================= > >> ===== --- head/graphics/libGL/files/patch-configure Sat Feb 11 17:42:06 > >> 2017 (r433896) +++ head/graphics/libGL/files/patch-configure Sat Feb 11 > >> 17:44:59 2017 (r433897) @@ -330,62 +48,6 @@ > >> > >> if test "x$have_libclc" = xno; then > >> > >> as_fn_error $? "pkg-config cannot find libclc.pc which is > >> required to build clover.>> > >> -@@ -26375,26 +26397,26 @@ fi > >> - strip_unwanted_llvm_flags() { > >> - # Use \> (marks the end of the word) > >> - echo `$1` | sed \ > >> -- -e 's/-march=\S*//g' \ > >> -- -e 's/-mtune=\S*//g' \ > >> -- -e 's/-mcpu=\S*//g' \ > >> -- -e 's/-DNDEBUG\>//g' \ > >> -- -e 's/-D_GNU_SOURCE\>//g' \ > >> -- -e 's/-pedantic\>//g' \ > >> -- -e 's/-Wcovered-switch-default\>//g' \ > >> -- -e 's/-O.\>//g' \ > >> -- -e 's/-g\>//g' \ > >> -- -e 's/-Wall\>//g' \ > >> -- -e 's/-Wcast-qual\>//g' \ > >> -- -e 's/-Woverloaded-virtual\>//g' \ > >> -- -e 's/-fcolor-diagnostics\>//g' \ > >> -- -e 's/-fdata-sections\>//g' \ > >> -- -e 's/-ffunction-sections\>//g' \ > >> -- -e 's/-fno-exceptions\>//g' \ > >> -- -e 's/-fomit-frame-pointer\>//g' \ > >> -- -e 's/-fvisibility-inlines-hidden\>//g' \ > >> -- -e 's/-fPIC\>//g' \ > >> -- -e 's/-fstack-protector-strong\>//g' > >> -+ -e 's/-march=[:graph:]* //g' \ > >> -+ -e 's/-mtune=[:graph:]* //g' \ > >> -+ -e 's/-mcpu=[:graph:]* //g' \ > >> -+ -e 's/-DNDEBUG[[:>:]]//g' \ > >> -+ -e 's/-D_GNU_SOURCE[[:>:]]//g' \ > >> -+ -e 's/-pedantic[[:>:]]//g' \ > >> -+ -e 's/-Wcovered-switch-default[[:>:]]//g' \ > >> -+ -e 's/-O.[[:>:]]//g' \ > >> -+ -e 's/-g[[:>:]]//g' \ > >> -+ -e 's/-Wall[[:>:]]//g' \ > >> -+ -e 's/-Wcast-qual[[:>:]]//g' \ > >> -+ -e 's/-Woverloaded-virtual[[:>:]]//g' \ > >> -+ -e 's/-fcolor-diagnostics[[:>:]]//g' \ > >> -+ -e 's/-fdata-sections[[:>:]]//g' \ > >> -+ -e 's/-ffunction-sections[[:>:]]//g' \ > >> -+ -e 's/-fno-exceptions[[:>:]]//g' \ > >> -+ -e 's/-fomit-frame-pointer[[:>:]]//g' \ > >> -+ -e 's/-fvisibility-inlines-hidden[[:>:]]//g' \ > >> -+ -e 's/-fPIC[[:>:]]//g' \ > >> -+ -e 's/-fstack-protector-strong[[:>:]]//g' > > > > These changes should stay :) > > I agree, but it looks like the \> part is now taken care of by a sed > expression in post-configure, while the \S was forgotten. > > I've fixed it locally by adding "-e 's|\\S\*//|[:graph:]* //|'" to the > relevant REINPLACE_CMD in graphics/libGL/Makefile.targets, line 20. > > I'm not 1000% sure my solution is the correct one but it does generate > the same configure lines as the diff above. Thank you for that sed command. This section looked like the work of sed, but in my haste to trim the patches I did not notice the absence of the command that produced this section. I have confirmed the suggested addition corrects the build error and committed the fix. I did not see the problem yesterday because it is only evident when setting CPUTYPE.