fix gcc6 visibility support detection (review#128697)

This commit is contained in:
Rex Dieter 2016-08-16 09:07:29 -05:00
parent f866561ce7
commit 725603e7ca
2 changed files with 19 additions and 1 deletions

View File

@ -51,7 +51,7 @@ Summary: KDE Libraries
# shipped with kde applications, version...
%global apps_version 16.08.0
Version: 4.14.23
Release: 1%{?dist}
Release: 2%{?dist}
Name: kdelibs
Epoch: 6
@ -198,6 +198,8 @@ Patch67: kdelibs-4.14.17-gcc6_narrowing_hack.patch
## upstream
# 4.14 branch
# fix visibility support, https://git.reviewboard.kde.org/r/128697
Patch100: rb128697.patch
## security fix
@ -865,6 +867,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
* Tue Aug 16 2016 Rex Dieter <rdieter@fedoraproject.org> - 6:4.14.23-2
- fix gcc6 visibility support detection (review#128697)
* Fri Aug 12 2016 Rex Dieter <rdieter@fedoraproject.org> - 6:4.14.23-1
- 4.14.23 (kde-apps-16.08.0)

13
rb128697.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
index 7d54b9b83b999f6a6e8541f8e8b89e0b2a105703..c345eca36f4255c03e88a31c53cf2a2efd0e2c42 100644
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
@@ -1221,7 +1221,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
# get the gcc version
exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info)
- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
+ string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
# gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here:
if (NOT _gcc_version)
string (REGEX MATCH ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${gcc_on_macos}")