From 4b35f21d43dcb365da67fce9899e659a21fa79a5 Mon Sep 17 00:00:00 2001 From: Denis Reva Date: Thu, 22 Dec 2022 11:45:51 +0500 Subject: [PATCH] media-libs/amdvlk: Disabled adding werror on it's own Closes: https://bugs.gentoo.org/887777 Signed-off-by: Denis Reva --- media-libs/amdvlk/amdvlk-2022.4.4.ebuild | 9 ++++++++- .../files/amdvlk-2022.4.4-r1-disable-Werror.patch | 13 +++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 media-libs/amdvlk/files/amdvlk-2022.4.4-r1-disable-Werror.patch diff --git a/media-libs/amdvlk/amdvlk-2022.4.4.ebuild b/media-libs/amdvlk/amdvlk-2022.4.4.ebuild index 38fe858d04..27a9903d64 100644 --- a/media-libs/amdvlk/amdvlk-2022.4.4.ebuild +++ b/media-libs/amdvlk/amdvlk-2022.4.4.ebuild @@ -68,6 +68,7 @@ PATCHES=( "${FILESDIR}/amdvlk-2022.4.2-license-path.patch" #878803 "${FILESDIR}/amdvlk-2022.4.2-reduced-llvm-installations.patch" "${FILESDIR}/amdvlk-2022.4.2-reduced-llvm-installations-part2.patch" + "${FILESDIR}/amdvlk-2022.4.4-r1-disable-Werror.patch" #887777 ) src_prepare() { @@ -90,11 +91,17 @@ multilib_src_configure() { -DVKI_RAY_TRACING=$(usex raytracing) -DLLVM_VERSION_SUFFIX="-amdvlk" -DLLVM_HOST_TRIPLE="${CHOST}" + -DLLVM_ENABLE_WERROR=OFF + -DSPVGEN_ENABLE_WERROR=OFF + -DENABLE_WERROR=OFF + -DVAM_ENABLE_WERROR=OFF + -DICD_ANALYSIS_WARNINGS_AS_ERRORS=OFF + -DMETROHASH_ENABLE_WERROR=OFF -DBUILD_SHARED_LIBS=OFF #LLVM parts don't support shared libs -DPython3_EXECUTABLE="${PYTHON}" -DPACKAGE_VERSION="${PV}" -DPACKAGE_NAME="${PN}" - -DLLVM_INSTALL_TOOLCHAIN_ONLY=On #Disable installation of various LLVM parts which we had to clean up. + -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON #Disable installation of various LLVM parts which we had to clean up. -Wno-dev ) cmake_src_configure diff --git a/media-libs/amdvlk/files/amdvlk-2022.4.4-r1-disable-Werror.patch b/media-libs/amdvlk/files/amdvlk-2022.4.4-r1-disable-Werror.patch new file mode 100644 index 0000000000..01c28e0ea5 --- /dev/null +++ b/media-libs/amdvlk/files/amdvlk-2022.4.4-r1-disable-Werror.patch @@ -0,0 +1,13 @@ +diff --git a/pal/shared/devdriver/cmake/DevDriver.cmake b/pal/shared/devdriver/cmake/DevDriver.cmake +index b3f2e7e48..cbd9f7839 100644 +--- a/pal/shared/devdriver/cmake/DevDriver.cmake ++++ b/pal/shared/devdriver/cmake/DevDriver.cmake +@@ -111,7 +111,7 @@ function(apply_devdriver_warnings name) + target_compile_options(${name} PRIVATE + -Wall # Enable all warnings. + -Wextra # Enable extra warnings that are not enabled by -Wall. +- -Werror # warning as error ++ #-Werror # warning as error + ) + elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + target_compile_options(${name} PRIVATE