Skip to content

stlink-1.4.0, fix FL-4356: multilib-strict check failed #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
unreg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

stlink-1.4.0, fix FL-4356: multilib-strict check failed #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions dev-embedded/stlink/files/stlink-1.4.0.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
--- stlink-1.4.0/CMakeLists.txt
+++ stlink-1.4.0/CMakeLists.txt
@@ -4,7 +4,8 @@
set(PROJECT_DESCRIPTION "Open source version of the STMicroelectronics Stlink Tools")
set(STLINK_UDEV_RULES_DIR "/etc/udev/rules.d" CACHE PATH "Udev rules directory")
set(STLINK_MODPROBED_DIR "/etc/modprobe.d" CACHE PATH "modprobe.d directory")
-set(STLINK_LIBRARY_PATH "lib/${CMAKE_LIBRARY_PATH}" CACHE PATH "Target lib directory")
+set(LIB_INSTALL_DIR "lib" CACHE PATH "Main library directory")
+set(STLINK_LIBRARY_PATH "${LIB_INSTALL_DIR}/${CMAKE_LIBRARY_PATH}" CACHE PATH "Target lib directory")

option(STLINK_GENERATE_MANPAGES "Generate manpages with pandoc" OFF)

3 changes: 3 additions & 0 deletions dev-embedded/stlink/stlink-1.4.0.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,13 @@ RDEPEND="virtual/libusb:1
DEPEND="${RDEPEND}
virtual/pkgconfig"

PATCHES=( "${FILESDIR}"/${P}.patch )

src_configure() {
local mycmakeargs=(
-DSTLINK_UDEV_RULES_DIR="$(get_udevdir)"/rules.d
-DSTLINK_MODPROBED_DIR="${EPREFIX}/etc/modprobe.d"
-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
)

cmake-utils_src_configure
Expand Down