From 4aeffd06d92990a5f9fb34c33b05e1bd6f894ba0 Mon Sep 17 00:00:00 2001 From: tmnhy Date: Sun, 12 Nov 2017 22:33:18 +0300 Subject: [PATCH] Fix FL-4356: multilib-strict check failed --- dev-embedded/stlink/files/stlink-1.4.0.patch | 12 ++++++++++++ dev-embedded/stlink/stlink-1.4.0.ebuild | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 dev-embedded/stlink/files/stlink-1.4.0.patch diff --git a/dev-embedded/stlink/files/stlink-1.4.0.patch b/dev-embedded/stlink/files/stlink-1.4.0.patch new file mode 100644 index 0000000000..485e7c21f6 --- /dev/null +++ b/dev-embedded/stlink/files/stlink-1.4.0.patch @@ -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) + diff --git a/dev-embedded/stlink/stlink-1.4.0.ebuild b/dev-embedded/stlink/stlink-1.4.0.ebuild index c7300459c3..344b38fbaa 100644 --- a/dev-embedded/stlink/stlink-1.4.0.ebuild +++ b/dev-embedded/stlink/stlink-1.4.0.ebuild @@ -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