From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 9 Jan 2022 16:32:02 +0000 (-0800)
Subject: Revert "sed cleanup of CFLAGS from perl which break on opencsw - should be harmless... 
X-Git-Tag: 3.0.0~76^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c667dc4ca6fe3bca349686d73a6c23ef5aee95f;p=graphviz

Revert "sed cleanup of CFLAGS from perl which break on opencsw - should be harmless elsewhere"

This reverts commit a750d28463a9248fe5a42d3dae5768d38853d837. It is unclear to
me exactly what flag the original code was attempting to suppress, but this
regex is too broad. The specific case causing problems right now is that it
incorrectly mangled `-mno-xop -mbmi` into `-mno-mbmi`. Given the original code
appears to have been working around a 2011 OpenCSW packaging mistake, lets
assume this was fixed sometime in the last decade and see if anyone downstream
complains when we remove the work around.

Gitlab: fixes #2177
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fea453ab..c92f42c07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - The Ming plugin that produced Shockwave files has been removed. This format
   was EOLed by Adobe in April 2019. #2160
 - CentOS 7 packages now include libmingle and the `mingle` program.
-- The tclpkg Makefile no longer suppresses `-fstack-clash-protection`
+- The tclpkg Makefile no longer suppresses `-fstack-clash-protection` nor
+  other compiler options containing `-x`
 
 ### Fixed
 
@@ -29,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Plugins are not configured on MinGW #2176
 - gvpr on MinGW does not support absolute paths #1780
 - PNG format not available in CMake builds with MinGW
+- tclpkg Makefile corrupts CFLAGS #2177
 
 ## [2.50.0] – 2021-12-04
 
diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index b8f0fb3a9..f3cf103f4 100644
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -174,8 +174,7 @@ gv.a:	gv.cmxa
 
 pkgperldir = $(pkglibdir)/perl
 PERL        ?= perl
-# cleanup for opencsw's perl which adds flags that g++ doesn't like
-PERL_CC      = `$(PERL) -MExtUtils::Embed -e ccopts | $(PERL) -pe 's/-x.*? //g'`
+PERL_CC      = `$(PERL) -MExtUtils::Embed -e ccopts`
 PERL_LD      = `$(PERL) -MExtUtils::Embed -e ldopts`
 VENDOR_ARCH  = `$(PERL) -MConfig -e 'print $$Config{installvendorarch};'`
 PERL_data = gv.pm