summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2018-08-20 00:03:30 +1000
committerMichael Palimaka <kensington@gentoo.org>2018-08-20 00:07:54 +1000
commita49d8c2a95711b9f166c59e3be0df26b75b88290 (patch)
tree6972a435dc9482c119aa50bc28fd6b5ee06d630e /kde-frameworks
parentgames-simulation/openrct2: drop old (diff)
downloadgentoo-a49d8c2a95711b9f166c59e3be0df26b75b88290.tar.gz
gentoo-a49d8c2a95711b9f166c59e3be0df26b75b88290.tar.bz2
gentoo-a49d8c2a95711b9f166c59e3be0df26b75b88290.zip
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
Diffstat (limited to 'kde-frameworks')
-rw-r--r--kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0-r1.ebuild (renamed from kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0.ebuild)2
-rw-r--r--kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.49.0-no-fatal-warnings.patch19
2 files changed, 21 insertions, 0 deletions
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
index 376fd431589..7003678df8f 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 00000000000..f71d19d5fc8
--- /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}")