packages/wxGTK3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!21 [sync] PR-20: Add pie compile option

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @lyn1001 
Signed-off-by: @lyn1001
This commit is contained in:
openeuler-ci-bot 2023-06-07 08:14:15 +00:00 committed by Gitee
commit ca614d8c0d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
add-pie-compile-option.patch Normal file
View File

@ -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)

6
wxGTK3.spec
View File

@ -1,6 +1,6 @@
Name: wxGTK3 Name: wxGTK3
Version: 3.0.4 Version: 3.0.4
Release: 10 Release: 11
Summary: C++ Library for Cross-Platform Development Summary: C++ Library for Cross-Platform Development
License: GPL-2.0-or-later or LGPL-2.1-only 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 Source0: https://github.com/wxWidgets/wxWidgets/releases/download/v%{version}/wxWidgets-%{version}.tar.bz2
Source1: wx-config Source1: wx-config
Patch0001: wxGTK3-3.0.3-abicheck.patch 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: 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: libtiff-devel expat-devel SDL2-devel libGLU-devel libSM-devel gstreamer1-plugins-base-devel
@ -239,6 +240,9 @@ fi
%changelog %changelog
* Wed Jun 07 2023 xu_ping <707078654@qq.com> - 3.0.4-11
- Add pie compile option
* Wed Apr 26 2023 Ge Wang <wang__ge@126.com> - 3.0.4-10 * Wed Apr 26 2023 Ge Wang <wang__ge@126.com> - 3.0.4-10
- fix EBS compile failure caused by gcc_secure replace compiler inadequacy - fix EBS compile failure caused by gcc_secure replace compiler inadequacy