dev-embedded/stlink: Fix multilib-strict error, bug #630932

Package-Manager: Portage-2.3.14, Repoman-2.3.6
Closes: https://bugs.gentoo.org/630932

diff --git a/dev-embedded/stlink/files/stlink-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch b/dev-embedded/stlink/files/stlink-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch
new file mode 100644 (file)
index 0000000..aa077c0
--- /dev/null
+++ b/dev-embedded/stlink/files/stlink-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch
@@ -0,0 +1,50 @@
+From cbba564f60bacd30344f9bb5c7bebaf8283b6794 Mon Sep 17 00:00:00 2001
+From: Vasiliy Glazov <vascom2@gmail.com>
+Date: Fri, 8 Sep 2017 15:00:45 +0300
+Subject: [PATCH] Added LIB_INSTALL_DIR to correct libs install on 64-bit
+ systems (#636)
+
+* Added LIB_INSTALL_DIR to correct libs install on 64-bit systems
+* Add description for using LIB_INSTALL_DIR parameter.
+---
+ CMakeLists.txt   | 3 ++-
+ doc/compiling.md | 9 +++++++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 46790de..da99b6e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,7 +4,8 @@ project(stlink C)
+ 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/doc/compiling.md b/doc/compiling.md
+index 3518d10..41d1fb7 100644
+--- a/doc/compiling.md
++++ b/doc/compiling.md
+@@ -118,6 +118,15 @@ $ cmake -DSTLINK_UDEV_RULES_DIR="/usr/lib/udev/rules.d" \
+         -DSTLINK_MODPROBED_DIR="/usr/lib/modprobe.d" ..
+ ```
+ 
++## Build using different directory for shared libs
++
++To put the compiled shared libs into a different directory during installation
++you can use the following cmake option:
++
++```
++$ cmake -DLIB_INSTALL_DIR:PATH="/usr/lib64"  ..
++```
++
+ ## Windows (MinGW64) 
+ 
+ ### Prequistes
+-- 
+2.13.6
+

diff --git a/dev-embedded/stlink/stlink-1.4.0.ebuild b/dev-embedded/stlink/stlink-1.4.0.ebuild
index c7300459c3552d56dc0ffbcdb93ecbfc12a5e805..c349f40b793c5817b4df7620ec986430fa20c8bc 100644 (file)
--- a/dev-embedded/stlink/stlink-1.4.0.ebuild
+++ b/dev-embedded/stlink/stlink-1.4.0.ebuild
@@ -25,10 +25,14 @@ RDEPEND="virtual/libusb:1
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 
+# Fix bug #630932; >1.4.0 should render this obsolete
+PATCHES=( "${FILESDIR}/${PN}-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch" )
+
 src_configure() {
        local mycmakeargs=(
                -DSTLINK_UDEV_RULES_DIR="$(get_udevdir)"/rules.d
                -DSTLINK_MODPROBED_DIR="${EPREFIX}/etc/modprobe.d"
+               -DLIB_INSTALL_DIR:PATH="$(get_libdir)"
        )
 
        cmake-utils_src_configure

diff --git a/dev-embedded/stlink/stlink-9999.ebuild b/dev-embedded/stlink/stlink-9999.ebuild
index c7300459c3552d56dc0ffbcdb93ecbfc12a5e805..479ca67cd59193d8d88659a2f8e32d08b0d4024e 100644 (file)
--- a/dev-embedded/stlink/stlink-9999.ebuild
+++ b/dev-embedded/stlink/stlink-9999.ebuild
@@ -29,6 +29,7 @@ src_configure() {
        local mycmakeargs=(
                -DSTLINK_UDEV_RULES_DIR="$(get_udevdir)"/rules.d
                -DSTLINK_MODPROBED_DIR="${EPREFIX}/etc/modprobe.d"
+               -DLIB_INSTALL_DIR:PATH="$(get_libdir)"
        )
 
        cmake-utils_src_configure