diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-01-16 20:27:28 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-01-16 20:27:28 +0000 |
commit | 2fd57282f0262ca084e05b0f2c63fbada395d02b (patch) | |
tree | 4e0f23cea9ce9fd972e70ebc5214bf36fed465cc /net-irc/quassel/files/quassel-0.14.0-cxxflags.patch | |
parent | c3bc61051d7f12b4c682efa7a5460bbc8815649e (diff) |
gentoo resync : 16.01.2021
Diffstat (limited to 'net-irc/quassel/files/quassel-0.14.0-cxxflags.patch')
-rw-r--r-- | net-irc/quassel/files/quassel-0.14.0-cxxflags.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/net-irc/quassel/files/quassel-0.14.0-cxxflags.patch b/net-irc/quassel/files/quassel-0.14.0-cxxflags.patch new file mode 100644 index 000000000000..119261f789af --- /dev/null +++ b/net-irc/quassel/files/quassel-0.14.0-cxxflags.patch @@ -0,0 +1,32 @@ +From b1eff3d32b2a18c52a8f30632746956a17089204 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Sat, 8 Jan 2022 13:26:05 -0500 +Subject: [PATCH] cmake: avoid de-duplication of user's CXXFLAGS + +Use the "SHELL:" prefix behavior introduced in cmake 3.12 to avoid the +option de-duplication behavior of add_compile_options(). + +Bug: https://bugs.gentoo.org/830738 +--- + cmake/QuasselMacros.cmake | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/cmake/QuasselMacros.cmake b/cmake/QuasselMacros.cmake +index 3f9f09269..9ba0003a8 100644 +--- a/cmake/QuasselMacros.cmake ++++ b/cmake/QuasselMacros.cmake +@@ -410,8 +410,12 @@ endfunction() + function(process_cmake_cxx_flags) + string(TOUPPER ${CMAKE_BUILD_TYPE} upper_build_type) + set(cxx_flags "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${upper_build_type}}") +- separate_arguments(sep_cxx_flags UNIX_COMMAND ${cxx_flags}) +- add_compile_options(${sep_cxx_flags}) ++ if(CMAKE_VERSION VERSION_LESS 3.12) ++ separate_arguments(sep_cxx_flags UNIX_COMMAND ${cxx_flags}) ++ add_compile_options(${sep_cxx_flags}) ++ else() ++ add_compile_options("SHELL:${cxx_flags}") ++ endif() + set(CMAKE_CXX_FLAGS "" PARENT_SCOPE) + set(CMAKE_CXX_FLAGS_${upper_build_type} "" PARENT_SCOPE) + endfunction() |