Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/, kde-frameworks/extra-cmake-modules/
Date: Sun, 19 Aug 2018 14:00:48
Message-Id: 1534687225.d02ce6c1b55141859d389596b079200ad6e9e400.kensington@gentoo
1 commit: d02ce6c1b55141859d389596b079200ad6e9e400
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 19 14:00:12 2018 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 19 14:00:25 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d02ce6c1
7
8 kde-frameworks/extra-cmake-modules: avoid build failure with GCC8 and ld.gold
9
10 Bug: https://bugs.gentoo.org/663512
11 Package-Manager: Portage-2.3.44, Repoman-2.3.10
12
13 .../extra-cmake-modules-9999.ebuild | 2 ++
14 ...extra-cmake-modules-5.49.0-no-fatal-warnings.patch | 19 +++++++++++++++++++
15 2 files changed, 21 insertions(+)
16
17 diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild
18 index e25c18f8b4..8ca8a79e63 100644
19 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild
20 +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild
21 @@ -31,6 +31,8 @@ RDEPEND="
22 app-arch/libarchive[bzip2]
23 "
24
25 +PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" )
26 +
27 python_check_deps() {
28 has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
29 }
30
31 diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.49.0-no-fatal-warnings.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.49.0-no-fatal-warnings.patch
32 new file mode 100644
33 index 0000000000..f71d19d5fc
34 --- /dev/null
35 +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.49.0-no-fatal-warnings.patch
36 @@ -0,0 +1,19 @@
37 +Avoid triggering a build failure with GCC8 and ld.gold producing warnings.
38 +
39 +Bug: https://bugs.gentoo.org/663512
40 +
41 +diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake
42 +index 44358fb..0270aa5 100644
43 +--- a/kde-modules/KDECompilerSettings.cmake
44 ++++ b/kde-modules/KDECompilerSettings.cmake
45 +@@ -344,8 +344,8 @@ if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT APPLE) OR
46 + (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT APPLE) OR
47 + (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT WIN32))
48 + # Linker warnings should be treated as errors
49 +- set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}")
50 +- set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_MODULE_LINKER_FLAGS}")
51 ++# set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}")
52 ++# set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_MODULE_LINKER_FLAGS}")
53 +
54 + # Do not allow undefined symbols, even in non-symbolic shared libraries
55 + set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}")