svn commit: r433897 - in head: graphics/libGL/files graphics/libdrm/files x11-servers/xorg-server/files

[Guido Falsi]

On 02/11/17 20:44, Tijl Coosemans wrote:
> On Sat, 11 Feb 2017 17:45:00 +0000 (UTC) Matthew Rezny <rezny at FreeBSD.org> 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 <madpilot at FreeBSD.org>