1 |
commit: 4da043aa794888f08ab2ebfda77a95182f96ed38 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 14 18:31:01 2022 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 14 18:31:01 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da043aa |
7 |
|
8 |
net-irc/quassel: fix CXXFLAGS de-duplication |
9 |
|
10 |
Closes: https://bugs.gentoo.org/830738 |
11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
12 |
|
13 |
.../quassel/files/quassel-0.14.0-cxxflags.patch | 32 ++++++++++++++++++++++ |
14 |
net-irc/quassel/quassel-0.14.0.ebuild | 4 +++ |
15 |
2 files changed, 36 insertions(+) |
16 |
|
17 |
diff --git a/net-irc/quassel/files/quassel-0.14.0-cxxflags.patch b/net-irc/quassel/files/quassel-0.14.0-cxxflags.patch |
18 |
new file mode 100644 |
19 |
index 000000000000..119261f789af |
20 |
--- /dev/null |
21 |
+++ b/net-irc/quassel/files/quassel-0.14.0-cxxflags.patch |
22 |
@@ -0,0 +1,32 @@ |
23 |
+From b1eff3d32b2a18c52a8f30632746956a17089204 Mon Sep 17 00:00:00 2001 |
24 |
+From: Mike Gilbert <floppym@g.o> |
25 |
+Date: Sat, 8 Jan 2022 13:26:05 -0500 |
26 |
+Subject: [PATCH] cmake: avoid de-duplication of user's CXXFLAGS |
27 |
+ |
28 |
+Use the "SHELL:" prefix behavior introduced in cmake 3.12 to avoid the |
29 |
+option de-duplication behavior of add_compile_options(). |
30 |
+ |
31 |
+Bug: https://bugs.gentoo.org/830738 |
32 |
+--- |
33 |
+ cmake/QuasselMacros.cmake | 8 ++++++-- |
34 |
+ 1 file changed, 6 insertions(+), 2 deletions(-) |
35 |
+ |
36 |
+diff --git a/cmake/QuasselMacros.cmake b/cmake/QuasselMacros.cmake |
37 |
+index 3f9f09269..9ba0003a8 100644 |
38 |
+--- a/cmake/QuasselMacros.cmake |
39 |
++++ b/cmake/QuasselMacros.cmake |
40 |
+@@ -410,8 +410,12 @@ endfunction() |
41 |
+ function(process_cmake_cxx_flags) |
42 |
+ string(TOUPPER ${CMAKE_BUILD_TYPE} upper_build_type) |
43 |
+ set(cxx_flags "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${upper_build_type}}") |
44 |
+- separate_arguments(sep_cxx_flags UNIX_COMMAND ${cxx_flags}) |
45 |
+- add_compile_options(${sep_cxx_flags}) |
46 |
++ if(CMAKE_VERSION VERSION_LESS 3.12) |
47 |
++ separate_arguments(sep_cxx_flags UNIX_COMMAND ${cxx_flags}) |
48 |
++ add_compile_options(${sep_cxx_flags}) |
49 |
++ else() |
50 |
++ add_compile_options("SHELL:${cxx_flags}") |
51 |
++ endif() |
52 |
+ set(CMAKE_CXX_FLAGS "" PARENT_SCOPE) |
53 |
+ set(CMAKE_CXX_FLAGS_${upper_build_type} "" PARENT_SCOPE) |
54 |
+ endfunction() |
55 |
|
56 |
diff --git a/net-irc/quassel/quassel-0.14.0.ebuild b/net-irc/quassel/quassel-0.14.0.ebuild |
57 |
index 4508c79fbeb9..ad984f995d66 100644 |
58 |
--- a/net-irc/quassel/quassel-0.14.0.ebuild |
59 |
+++ b/net-irc/quassel/quassel-0.14.0.ebuild |
60 |
@@ -87,6 +87,10 @@ REQUIRED_USE="|| ( X server monolithic ) |
61 |
spell? ( || ( X monolithic ) ) |
62 |
syslog? ( || ( server monolithic ) )" |
63 |
|
64 |
+PATCHES=( |
65 |
+ "${FILESDIR}/quassel-0.14.0-cxxflags.patch" |
66 |
+) |
67 |
+ |
68 |
src_configure() { |
69 |
local mycmakeargs=( |
70 |
-DBUILD_TESTING=$(usex test) |