From 603a438ea9026dcf248b3688cfcc64393a9f9aae Mon Sep 17 00:00:00 2001 From: wang--ge Date: Mon, 28 Nov 2022 11:34:39 +0800 Subject: [PATCH] fix compile failure due to gcc_secure renamed compile tools --- wxGTK3.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/wxGTK3.spec b/wxGTK3.spec index a4adab6..1231d73 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -1,9 +1,9 @@ Name: wxGTK3 Version: 3.0.4 -Release: 6 +Release: 7 Summary: C++ Library for Cross-Platform Development -License: wxWidgets +License: GPL-2.0-or-later or LGPL-2.1-only URL: https://www.wxwidgets.org/ Source0: https://github.com/wxWidgets/wxWidgets/releases/download/v%{version}/wxWidgets-%{version}.tar.bz2 Source1: wx-config @@ -11,7 +11,7 @@ Patch0001: wxGTK3-3.0.3-abicheck.patch BuildRequires: gtk2-devel gtk3-devel webkit2gtk3-devel zlib-devel libpng-devel libjpeg-devel BuildRequires: libtiff-devel expat-devel SDL2-devel libGLU-devel libSM-devel gstreamer1-plugins-base-devel -BuildRequires: GConf2-devel gettext cppunit-devel libmspack-devel doxygen gcc gcc-c++ +BuildRequires: GConf2-devel gettext cppunit-devel libmspack-devel doxygen gcc gcc-c++ file Requires: wxBase3 = %{version}-%{release} wxGTK3-i18n = %{version}-%{release} Provides: wxWidgets = %{version}-%{release} bundled(scintilla) = 3.2.1 @@ -114,6 +114,16 @@ CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export LDFLAGS="-Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wl,--as-needed" export CPPUNIT_CONFIG="/usr/bin/pkg-config cppunit" +#package gcc_secure will add _old suffix to compile tools +gccexec=`file /usr/bin/gcc` +if [[ ${gccexec} =~ "shell script" ]]; then + for line in `find . -name Makefile.in`; + do + sed -i 's/@CC@/@CC@_old/g' $line + sed -i 's/@CXX@/@CXX@_old/g' $line + done +fi + %global _configure ../configure install -d bld_gtk2 @@ -227,6 +237,9 @@ fi %changelog +* Fri Nov 25 2022 Ge Wang - 3.0.4-7 +- Fix build failure due to gcc_secure ranamed compile tools + * Mon May 31 2021 huanghaitao - 3.0.4-6 - Completing build dependencies to fix gcc/gcc-c++ compiler missing error -- Gitee