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 F2F27158020 for ; Thu, 24 Nov 2022 15:50:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2939AE08EF; Thu, 24 Nov 2022 15:50:00 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 11F27E08EF for ; Thu, 24 Nov 2022 15:50:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 496AA340F4F for ; Thu, 24 Nov 2022 15:49:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A4D60692 for ; Thu, 24 Nov 2022 15:49:57 +0000 (UTC) From: "Nick Sarnie" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" Message-ID: <1669304983.8a5255d01d4eda811fd26e1be4124b06c34bff33.sarnex@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/files/, media-libs/vulkan-layers/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/vulkan-layers/files/vulkan-layers-1.3.231-Make-BUILD_WERROR-actually-work.patch media-libs/vulkan-layers/vulkan-layers-1.3.231.ebuild X-VCS-Directories: media-libs/vulkan-layers/files/ media-libs/vulkan-layers/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: 8a5255d01d4eda811fd26e1be4124b06c34bff33 X-VCS-Branch: master Date: Thu, 24 Nov 2022 15:49:57 +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: b3f2e0a0-344c-42fc-b605-b6b652edc578 X-Archives-Hash: 4f8437b93379ba06c8c82919e18d7449 commit: 8a5255d01d4eda811fd26e1be4124b06c34bff33 Author: Nick Sarnie gentoo org> AuthorDate: Thu Nov 24 15:48:40 2022 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Thu Nov 24 15:49:43 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a5255d0 media-libs/vulkan-layers: You have got to be kidding me Bug: https://bugs.gentoo.org/882727 Signed-off-by: Nick Sarnie gentoo.org> ...yers-1.3.231-Make-BUILD_WERROR-actually-work.patch | 19 +++++++++++++++++++ media-libs/vulkan-layers/vulkan-layers-1.3.231.ebuild | 4 +++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.231-Make-BUILD_WERROR-actually-work.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.231-Make-BUILD_WERROR-actually-work.patch new file mode 100644 index 000000000000..4bd9abf89a87 --- /dev/null +++ b/media-libs/vulkan-layers/files/vulkan-layers-1.3.231-Make-BUILD_WERROR-actually-work.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e3985fc6d..ea8d47bb3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -170,14 +170,6 @@ if(${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)") + -fno-strict-aliasing + -fno-builtin-memcmp) + +- # Treat warnings as errors for versions of GCC and c++11-compliant Clang versions that are shipped on Ubuntu 18.04 or older. +- if(BUILD_WERROR OR +- (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL 7.3.0) OR +- (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 6.0.0)) +- add_compile_options(-Werror) +- endif() +- +- + set(CMAKE_C_STANDARD 99) + + # For GCC version 7.1 or greater, we need to disable the implicit fallthrough warning since there's no consistent way to satisfy diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.231.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.231.ebuild index 8858c9eb415a..aaf3971f38e8 100644 --- a/media-libs/vulkan-layers/vulkan-layers-1.3.231.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-1.3.231.ebuild @@ -24,7 +24,9 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="wayland X" -PATCHES=( "${FILESDIR}/${P}-cmake-Cleanup-find_package-SPIRV-code.patch" ) +PATCHES=( "${FILESDIR}/${P}-cmake-Cleanup-find_package-SPIRV-code.patch" + "${FILESDIR}/${P}-Make-BUILD_WERROR-actually-work.patch" +) BDEPEND=">=dev-util/cmake-3.10.2" RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"