[gentoo-commits] repo/gentoo:master commit in: dev-embedded/stlink/files/, dev-embedded/stlink/

[gentoo-commits] repo/gentoo:master commit in: dev-embedded/stlink/files/, dev-embedded/stlink/

[Sam James]

commit:     60a72592945b8287664100188338baebb5b54503
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 11 05:55:14 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 11 05:55:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60a72592

dev-embedded/stlink: drop Werror

Closes: https://bugs.gentoo.org/746770
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../stlink/files/stlink-1.7.0-no-werror.patch        | 20 ++++++++++++++++++++
 dev-embedded/stlink/stlink-1.7.0.ebuild              |  6 +++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/dev-embedded/stlink/files/stlink-1.7.0-no-werror.patch b/dev-embedded/stlink/files/stlink-1.7.0-no-werror.patch
new file mode 100644
index 000000000000..79765787de52
--- /dev/null
+++ b/dev-embedded/stlink/files/stlink-1.7.0-no-werror.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/746770
+--- a/cmake/modules/c_flags.cmake
++++ b/cmake/modules/c_flags.cmake
+@@ -50,5 +50,4 @@ if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+     add_cflag_if_supported("-O0")
+ else ()
+     add_cflag_if_supported("-O2")
+-    add_cflag_if_supported("-Werror")
+ endif ()
+--- a/doc/dev/app-example/CMakeLists.txt
++++ b/doc/dev/app-example/CMakeLists.txt
+@@ -14,7 +14,7 @@ include_directories(${STLINK_INCLUDE_DIRS})
+ find_package(PkgConfig)
+ pkg_check_modules(STLINK REQUIRED stlink)
+ 
+-set(CMAKE_C_FLAGS " ${STLINK_CFLAGS_OTHER} -Wall -Werror")
++set(CMAKE_C_FLAGS " ${STLINK_CFLAGS_OTHER} -Wall")
+ 
+ add_executable(${PROJECT_NAME} ${SRCS})
+ 

diff --git a/dev-embedded/stlink/stlink-1.7.0.ebuild b/dev-embedded/stlink/stlink-1.7.0.ebuild
index e937418ed74f..6f33c17ee856 100644
--- a/dev-embedded/stlink/stlink-1.7.0.ebuild
+++ b/dev-embedded/stlink/stlink-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,6 +24,10 @@ RDEPEND="virtual/libusb:1
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.0-no-werror.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DSTLINK_UDEV_RULES_DIR="$(get_udevdir)"/rules.d