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

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 6fea453ab77c73d22be44d2647a81780795e39c7..c92f42c076142aaa98fe49665dc66dc8ee6bed99 100644 (file)
--- 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 b8f0fb3a96f667c7c3ca3d204f4332fa7e8b0387..f3cf103f45ea967c88366de56873fa56f8238ae8 100644 (file)
--- 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