From owner-svn-ports-head@freebsd.org Sat Feb 11 22:16:57 2017 Return-Path: Delivered-To: svn-ports-head@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 D56A6CDB978; Sat, 11 Feb 2017 22:16:57 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from mail.madpilot.net (grunt.madpilot.net [78.47.145.38]) (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 66EFB12D8; Sat, 11 Feb 2017 22:16:56 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from mail (mail [192.168.254.3]) by mail.madpilot.net (Postfix) with ESMTP id 3vLR4J04YqzZvk; Sat, 11 Feb 2017 23:16:48 +0100 (CET) Received: from mail.madpilot.net ([192.168.254.3]) by mail (mail.madpilot.net [192.168.254.3]) (amavisd-new, port 10024) with ESMTP id ptEvmjGIDdnE; Sat, 11 Feb 2017 23:16:45 +0100 (CET) Received: from tommy.madpilot.net (micro.madpilot.net [88.149.173.206]) by mail.madpilot.net (Postfix) with ESMTPSA; Sat, 11 Feb 2017 23:16:45 +0100 (CET) Subject: Re: svn commit: r433897 - in head: graphics/libGL/files graphics/libdrm/files x11-servers/xorg-server/files To: Tijl Coosemans , Matthew Rezny References: <201702111745.v1BHj0gJ088130@repo.freebsd.org> <20170211204451.5b77ac7d@kalimero.tijl.coosemans.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org From: Guido Falsi Message-ID: <6ac0c251-a458-9470-4d20-fecdbeb384ae@FreeBSD.org> Date: Sat, 11 Feb 2017 23:16:45 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <20170211204451.5b77ac7d@kalimero.tijl.coosemans.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 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: Sat, 11 Feb 2017 22:16:57 -0000 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. -- Guido Falsi