From: Michael Palimaka <kensington@gentoo.org>
Date: Sun, 19 Aug 2018 14:03:30 +0000 (+1000)
Subject: kde-frameworks/extra-cmake-modules: avoid build failure with GCC8 and ld.gold
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a49d8c2a95711b9f166c59e3be0df26b75b88290;p=gentoo.git

kde-frameworks/extra-cmake-modules: avoid build failure with GCC8 and ld.gold

Bug: https://bugs.gentoo.org/663512
Package-Manager: Portage-2.3.44, Repoman-2.3.10
---

diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0-r1.ebuild
similarity index 95%
rename from kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0.ebuild
rename to kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0-r1.ebuild
index 376fd4315892..7003678df8f5 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0-r1.ebuild
@@ -31,6 +31,8 @@ RDEPEND="
 	app-arch/libarchive[bzip2]
 "
 
+PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" )
+
 python_check_deps() {
 	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
 }
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
new file mode 100644
index 000000000000..f71d19d5fc86
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.49.0-no-fatal-warnings.patch
@@ -0,0 +1,19 @@
+Avoid triggering a build failure with GCC8 and ld.gold producing warnings.
+
+Bug: https://bugs.gentoo.org/663512
+
+diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake
+index 44358fb..0270aa5 100644
+--- a/kde-modules/KDECompilerSettings.cmake
++++ b/kde-modules/KDECompilerSettings.cmake
+@@ -344,8 +344,8 @@ if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT APPLE) OR
+         (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT APPLE) OR
+         (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT WIN32))
+     # Linker warnings should be treated as errors
+-    set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}")
+-    set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_MODULE_LINKER_FLAGS}")
++#    set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}")
++#    set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_MODULE_LINKER_FLAGS}")
+ 
+     # Do not allow undefined symbols, even in non-symbolic shared libraries
+     set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}")