diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2018-08-20 00:00:12 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2018-08-20 00:00:25 +1000 |
| commit | d02ce6c1b55141859d389596b079200ad6e9e400 (patch) | |
| tree | f748776cce0e5fce47e2a3f837e2cfa686dcd0d9 | |
| parent | kde-plasma/plasma-nm: Use elog (diff) | |
| download | kde-d02ce6c1b55141859d389596b079200ad6e9e400.tar.gz kde-d02ce6c1b55141859d389596b079200ad6e9e400.tar.bz2 kde-d02ce6c1b55141859d389596b079200ad6e9e400.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
| -rw-r--r-- | kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild | 2 | ||||
| -rw-r--r-- | kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.49.0-no-fatal-warnings.patch | 19 |
2 files changed, 21 insertions, 0 deletions
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild index e25c18f8b4..8ca8a79e63 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.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 0000000000..f71d19d5fc --- /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}") |