diff --git a/add-pie-compile-option.patch b/add-pie-compile-option.patch new file mode 100644 index 0000000000000000000000000000000000000000..be52baaddebf28b646c9bc695798aa2d6c46da62 --- /dev/null +++ b/add-pie-compile-option.patch @@ -0,0 +1,13 @@ +diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in +index 44b7d02..dd9d4b8 100644 +--- a/utils/wxrc/Makefile.in ++++ b/utils/wxrc/Makefile.in +@@ -115,7 +115,7 @@ distclean: clean + rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile + + @COND_USE_XRC_1@wxrc$(EXEEXT): $(WXRC_OBJECTS) +-@COND_USE_XRC_1@ $(CXX) -o $@ $(WXRC_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) ++@COND_USE_XRC_1@ $(CXX) -fPIE -o $@ $(WXRC_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) -pie $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) + @COND_USE_XRC_1@ + @COND_USE_XRC_1@ $(__wxrc___mac_setfilecmd) + diff --git a/wxGTK3.spec b/wxGTK3.spec index 676878179a8c6315ebb63fb486c0b253e47bfe66..c45f447fc68ecc8f5a347a0f20f53d57124fdaf0 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -1,6 +1,6 @@ Name: wxGTK3 Version: 3.0.4 -Release: 10 +Release: 11 Summary: C++ Library for Cross-Platform Development License: GPL-2.0-or-later or LGPL-2.1-only @@ -8,6 +8,7 @@ URL: https://www.wxwidgets.org/ Source0: https://github.com/wxWidgets/wxWidgets/releases/download/v%{version}/wxWidgets-%{version}.tar.bz2 Source1: wx-config Patch0001: wxGTK3-3.0.3-abicheck.patch +Patch0002: add-pie-compile-option.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 @@ -239,6 +240,9 @@ fi %changelog +* Wed Jun 07 2023 xu_ping <707078654@qq.com> - 3.0.4-11 +- Add pie compile option + * Wed Apr 26 2023 Ge Wang - 3.0.4-10 - fix EBS compile failure caused by gcc_secure replace compiler inadequacy