7a03e47de6
* refresh patches * split out general build fixes out of the libusb patch * add patch for relocation of new config files Fixes #23063
41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
--- stlink-1.8.0/cmake/modules/c_flags.cmake.orig 2025-01-10 09:16:54.475755600 +0100
|
|
+++ stlink-1.8.0/cmake/modules/c_flags.cmake 2025-01-10 09:17:37.383976700 +0100
|
|
@@ -46,6 +46,4 @@
|
|
|
|
if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
|
|
add_cflag_if_supported("-ggdb")
|
|
-else ()
|
|
- add_cflag_if_supported("-Werror")
|
|
endif()
|
|
--- stlink-1.8.0/CMakeLists.txt.orig 2024-02-01 00:01:58.000000000 +0100
|
|
+++ stlink-1.8.0/CMakeLists.txt 2025-01-10 09:37:19.164287300 +0100
|
|
@@ -157,7 +157,7 @@
|
|
include_directories(src/stlink-lib)
|
|
|
|
## Set installation directory for header files
|
|
-if (WIN32)
|
|
+if (WIN32 AND FALSE)
|
|
set(STLINK_INCLUDE_PATH ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Main include install directory")
|
|
else ()
|
|
set(STLINK_INCLUDE_PATH ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} CACHE PATH "Main include install directory")
|
|
@@ -277,7 +277,7 @@
|
|
)
|
|
|
|
# Copy libusb DLL-library to binary output folder
|
|
-if (WIN32)
|
|
+if (WIN32 AND FALSE)
|
|
file(COPY ${LIBUSB_WIN_OUTPUT_FOLDER}/MinGW64/dll/libusb-1.0.dll
|
|
DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
file(COPY ${LIBUSB_WIN_OUTPUT_FOLDER}/MinGW64/dll/libusb-1.0.dll
|
|
--- stlink-1.8.0/CMakeLists.txt.orig 2025-01-10 09:46:19.567878800 +0100
|
|
+++ stlink-1.8.0/CMakeLists.txt 2025-01-10 10:08:59.551453500 +0100
|
|
@@ -379,7 +379,7 @@
|
|
###
|
|
|
|
# MCU configuration files
|
|
-if (WIN32)
|
|
+if (WIN32 AND FALSE)
|
|
set(CMAKE_CHIPS_DIR ${CMAKE_INSTALL_PREFIX}/config/chips)
|
|
else ()
|
|
set(CMAKE_CHIPS_DIR ${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME}/chips)
|