From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 631A4158087 for ; Fri, 14 Jan 2022 18:32:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 907652BC009; Fri, 14 Jan 2022 18:32:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 74C6E2BC009 for ; Fri, 14 Jan 2022 18:32:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 502BD342F95 for ; Fri, 14 Jan 2022 18:32:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 723CB291 for ; Fri, 14 Jan 2022 18:32:01 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1642185061.4da043aa794888f08ab2ebfda77a95182f96ed38.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/files/, net-irc/quassel/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/quassel/files/quassel-0.14.0-cxxflags.patch net-irc/quassel/quassel-0.14.0.ebuild X-VCS-Directories: net-irc/quassel/files/ net-irc/quassel/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 4da043aa794888f08ab2ebfda77a95182f96ed38 X-VCS-Branch: master Date: Fri, 14 Jan 2022 18:32:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e84a750a-1c04-4821-8bf0-dc6d0eda87a6 X-Archives-Hash: d5967b7a219e8f65323047bdb9336c5a commit: 4da043aa794888f08ab2ebfda77a95182f96ed38 Author: Mike Gilbert gentoo org> AuthorDate: Fri Jan 14 18:31:01 2022 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Fri Jan 14 18:31:01 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da043aa net-irc/quassel: fix CXXFLAGS de-duplication Closes: https://bugs.gentoo.org/830738 Signed-off-by: Mike Gilbert gentoo.org> .../quassel/files/quassel-0.14.0-cxxflags.patch | 32 ++++++++++++++++++++++ net-irc/quassel/quassel-0.14.0.ebuild | 4 +++ 2 files changed, 36 insertions(+) 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 +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() diff --git a/net-irc/quassel/quassel-0.14.0.ebuild b/net-irc/quassel/quassel-0.14.0.ebuild index 4508c79fbeb9..ad984f995d66 100644 --- a/net-irc/quassel/quassel-0.14.0.ebuild +++ b/net-irc/quassel/quassel-0.14.0.ebuild @@ -87,6 +87,10 @@ REQUIRED_USE="|| ( X server monolithic ) spell? ( || ( X monolithic ) ) syslog? ( || ( server monolithic ) )" +PATCHES=( + "${FILESDIR}/quassel-0.14.0-cxxflags.patch" +) + src_configure() { local mycmakeargs=( -DBUILD_TESTING=$(usex test)