[gentoo-commits] repo/gentoo:master commit in: dev-libs/intel-metrics-discovery/files/, dev-libs/intel-metrics-discovery/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/intel-metrics-discovery/files/, dev-libs/intel-metrics-discovery/

[Conrad Kostecki]

commit:     87976c713f4cb9fde6957b005fe34406107ef63b
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 20:06:54 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 20:06:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87976c71

dev-libs/intel-metrics-discovery: disable Werror

Closes: https://bugs.gentoo.org/920919
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 ...ics-discovery-1.12.170-revert-definitions.patch | 24 ++++++++++++++++++++++
 .../intel-metrics-discovery-1.12.170.ebuild        |  7 ++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/dev-libs/intel-metrics-discovery/files/intel-metrics-discovery-1.12.170-revert-definitions.patch b/dev-libs/intel-metrics-discovery/files/intel-metrics-discovery-1.12.170-revert-definitions.patch
new file mode 100644
index 000000000000..e8d1d5821e46
--- /dev/null
+++ b/dev-libs/intel-metrics-discovery/files/intel-metrics-discovery-1.12.170-revert-definitions.patch
@@ -0,0 +1,24 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -443,7 +443,7 @@
+     if ("${BUILD_TYPE}" STREQUAL "release")
+         add_definitions(-DNDEBUG)
+         # security compiler flags
+-        add_definitions(-O2 -D_FORTIFY_SOURCE=2 -Wformat)
++        add_definitions(-Wformat)
+     elseif ("${BUILD_TYPE}" STREQUAL "release-internal" OR
+             "${BUILD_TYPE}" STREQUAL "releaseinternal")
+             add_definitions(-D_RELEASE_INTERNAL)
+@@ -467,12 +467,7 @@
+         "${BUILD_TYPE}" STREQUAL "release-internal" OR
+         "${BUILD_TYPE}" STREQUAL "releaseinternal")
+         add_definitions(-Werror=format-security) # treat format string security warnings as errors
+-        add_definitions(-Werror)                 # treat warning as errors
+         add_definitions(-fvisibility=hidden)     # to disable exporting internal symbols (by default gcc exports all symbols)
+-        add_definitions(-flto)                   # enables Link-Time Optimization (LTO)
+-        add_definitions(-fPIC)                   # generates position-independent code during the compilation phase
+-        add_definitions(-fPIE)                   # generates position-independent executables during the compilation phase
+-        add_definitions(-pie)                    # produces position-independent executables during the linking phase
+     elseif ("${BUILD_TYPE}" STREQUAL "debug")
+         add_definitions(-g)
+     endif ()

diff --git a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.170.ebuild b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.170.ebuild
index fcc32bedadce..1aa1fe8dda1b 100644
--- a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.170.ebuild
+++ b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.170.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,10 +21,7 @@ KEYWORDS="~amd64"
 DEPEND="x11-libs/libdrm"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	default
-	cmake_src_prepare
-}
+PATCHES=( "${FILESDIR}/${PN}-1.12.170-revert-definitions.patch" )
 
 src_configure() {
 	local mycmakeargs=( -DLINUX_DISTRO="Gentoo" )