mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-embedded/stlink: add 1.8.0, drop 1.7.0
Closes: https://bugs.gentoo.org/678296 Closes: https://bugs.gentoo.org/842102 Closes: https://bugs.gentoo.org/842105 Closes: https://bugs.gentoo.org/893306 Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
This commit is contained in:
@@ -1 +1 @@
|
||||
DIST stlink-1.7.0.tar.gz 334883 BLAKE2B 7e00a01912e1d21fa29a7299fbb21f8e85540d3e4f4c90be8fcd9b4a8ef14bae2c0cd460463babf04fd52a11ebeac9601a5f31874dd4cce3077434c2bfc96168 SHA512 58b73c7a73809f36ab8ef53370bcbdba7456433c8559f350349febd282188541184b5c171eb2ca1ad38ec4b3ae32d3a89895a208bcacc264ec0aed5f61e6bcd0
|
||||
DIST stlink-1.8.0.tar.gz 257240 BLAKE2B 93977a0f1700b70b7fd8e17ef6ab2d636323665e4f98e5753ced1fce9de79b0cc3a47a5db973c39ce1ec1d1ecb7dbd2bfb91b4e41ee895d65fa4907136eba9dd SHA512 49245a4b0aeb926dd71ec4260b707d900318fe68e3a36e2e5543587fefb4886a9ff0ff42e0e12a8e727a5d4e9c7b4ce13989ca4d963842dbf960065e5fa0c968
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
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})
|
||||
|
||||
12
dev-embedded/stlink/files/stlink-1.8.0-werror.patch
Normal file
12
dev-embedded/stlink/files/stlink-1.8.0-werror.patch
Normal file
@@ -0,0 +1,12 @@
|
||||
diff '--color=auto' -urN stlink-1.8.0.orig/cmake/modules/c_flags.cmake stlink-1.8.0/cmake/modules/c_flags.cmake
|
||||
--- a/cmake/modules/c_flags.cmake 2025-04-03 19:45:45.311368396 +0300
|
||||
+++ b:wq/cmake/modules/c_flags.cmake 2025-04-03 19:45:58.947322298 +0300
|
||||
@@ -44,8 +44,3 @@
|
||||
add_cflag_if_supported("-fPIC")
|
||||
endif()
|
||||
|
||||
-if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
|
||||
- add_cflag_if_supported("-ggdb")
|
||||
-else ()
|
||||
- add_cflag_if_supported("-Werror")
|
||||
-endif()
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@@ -18,22 +18,20 @@ fi
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
|
||||
RDEPEND="virtual/libusb:1
|
||||
RDEPEND="
|
||||
virtual/libusb:1
|
||||
>=dev-libs/glib-2.32.0:2
|
||||
x11-libs/gtk+:3"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.7.0-no-werror.patch
|
||||
)
|
||||
PATCHES=( "${FILESDIR}/${P}-werror.patch" )
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DSTLINK_UDEV_RULES_DIR="$(get_udevdir)"/rules.d
|
||||
-DSTLINK_MODPROBED_DIR="${EPREFIX}/etc/modprobe.d"
|
||||
-DSTLINK_STATIC_LIB=OFF
|
||||
-DLIB_INSTALL_DIR:PATH="$(get_libdir)"
|
||||
-DCMAKE_COMPILE_WARNING_AS_ERROR=OFF
|
||||
)
|
||||
|
||||
cmake_src_configure
|
||||
Reference in New Issue
Block a user