| 1 |
commit: 2edae0f59ee430772e2f1106026c27c5f7b97ecf |
| 2 |
Author: Sven Wegener <swegener <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 10 14:30:06 2017 +0000 |
| 4 |
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 10 14:31:15 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2edae0f5 |
| 7 |
|
| 8 |
dev-embedded/stlink: Fix multilib-strict error, bug #630932 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.14, Repoman-2.3.6 |
| 11 |
Closes: https://bugs.gentoo.org/630932 |
| 12 |
|
| 13 |
...ink-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch | 50 ++++++++++++++++++++++ |
| 14 |
dev-embedded/stlink/stlink-1.4.0.ebuild | 4 ++ |
| 15 |
dev-embedded/stlink/stlink-9999.ebuild | 1 + |
| 16 |
3 files changed, 55 insertions(+) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..aa077c0823b |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-embedded/stlink/files/stlink-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch |
| 23 |
@@ -0,0 +1,50 @@ |
| 24 |
+From cbba564f60bacd30344f9bb5c7bebaf8283b6794 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Vasiliy Glazov <vascom2@×××××.com> |
| 26 |
+Date: Fri, 8 Sep 2017 15:00:45 +0300 |
| 27 |
+Subject: [PATCH] Added LIB_INSTALL_DIR to correct libs install on 64-bit |
| 28 |
+ systems (#636) |
| 29 |
+ |
| 30 |
+* Added LIB_INSTALL_DIR to correct libs install on 64-bit systems |
| 31 |
+* Add description for using LIB_INSTALL_DIR parameter. |
| 32 |
+--- |
| 33 |
+ CMakeLists.txt | 3 ++- |
| 34 |
+ doc/compiling.md | 9 +++++++++ |
| 35 |
+ 2 files changed, 11 insertions(+), 1 deletion(-) |
| 36 |
+ |
| 37 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 38 |
+index 46790de..da99b6e 100644 |
| 39 |
+--- a/CMakeLists.txt |
| 40 |
++++ b/CMakeLists.txt |
| 41 |
+@@ -4,7 +4,8 @@ project(stlink C) |
| 42 |
+ set(PROJECT_DESCRIPTION "Open source version of the STMicroelectronics Stlink Tools") |
| 43 |
+ set(STLINK_UDEV_RULES_DIR "/etc/udev/rules.d" CACHE PATH "Udev rules directory") |
| 44 |
+ set(STLINK_MODPROBED_DIR "/etc/modprobe.d" CACHE PATH "modprobe.d directory") |
| 45 |
+-set(STLINK_LIBRARY_PATH "lib/${CMAKE_LIBRARY_PATH}" CACHE PATH "Target lib directory") |
| 46 |
++set(LIB_INSTALL_DIR "lib" CACHE PATH "Main library directory") |
| 47 |
++set(STLINK_LIBRARY_PATH "${LIB_INSTALL_DIR}/${CMAKE_LIBRARY_PATH}" CACHE PATH "Target lib directory") |
| 48 |
+ |
| 49 |
+ option(STLINK_GENERATE_MANPAGES "Generate manpages with pandoc" OFF) |
| 50 |
+ |
| 51 |
+diff --git a/doc/compiling.md b/doc/compiling.md |
| 52 |
+index 3518d10..41d1fb7 100644 |
| 53 |
+--- a/doc/compiling.md |
| 54 |
++++ b/doc/compiling.md |
| 55 |
+@@ -118,6 +118,15 @@ $ cmake -DSTLINK_UDEV_RULES_DIR="/usr/lib/udev/rules.d" \ |
| 56 |
+ -DSTLINK_MODPROBED_DIR="/usr/lib/modprobe.d" .. |
| 57 |
+ ``` |
| 58 |
+ |
| 59 |
++## Build using different directory for shared libs |
| 60 |
++ |
| 61 |
++To put the compiled shared libs into a different directory during installation |
| 62 |
++you can use the following cmake option: |
| 63 |
++ |
| 64 |
++``` |
| 65 |
++$ cmake -DLIB_INSTALL_DIR:PATH="/usr/lib64" .. |
| 66 |
++``` |
| 67 |
++ |
| 68 |
+ ## Windows (MinGW64) |
| 69 |
+ |
| 70 |
+ ### Prequistes |
| 71 |
+-- |
| 72 |
+2.13.6 |
| 73 |
+ |
| 74 |
|
| 75 |
diff --git a/dev-embedded/stlink/stlink-1.4.0.ebuild b/dev-embedded/stlink/stlink-1.4.0.ebuild |
| 76 |
index c7300459c35..c349f40b793 100644 |
| 77 |
--- a/dev-embedded/stlink/stlink-1.4.0.ebuild |
| 78 |
+++ b/dev-embedded/stlink/stlink-1.4.0.ebuild |
| 79 |
@@ -25,10 +25,14 @@ RDEPEND="virtual/libusb:1 |
| 80 |
DEPEND="${RDEPEND} |
| 81 |
virtual/pkgconfig" |
| 82 |
|
| 83 |
+# Fix bug #630932; >1.4.0 should render this obsolete |
| 84 |
+PATCHES=( "${FILESDIR}/${PN}-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch" ) |
| 85 |
+ |
| 86 |
src_configure() { |
| 87 |
local mycmakeargs=( |
| 88 |
-DSTLINK_UDEV_RULES_DIR="$(get_udevdir)"/rules.d |
| 89 |
-DSTLINK_MODPROBED_DIR="${EPREFIX}/etc/modprobe.d" |
| 90 |
+ -DLIB_INSTALL_DIR:PATH="$(get_libdir)" |
| 91 |
) |
| 92 |
|
| 93 |
cmake-utils_src_configure |
| 94 |
|
| 95 |
diff --git a/dev-embedded/stlink/stlink-9999.ebuild b/dev-embedded/stlink/stlink-9999.ebuild |
| 96 |
index c7300459c35..479ca67cd59 100644 |
| 97 |
--- a/dev-embedded/stlink/stlink-9999.ebuild |
| 98 |
+++ b/dev-embedded/stlink/stlink-9999.ebuild |
| 99 |
@@ -29,6 +29,7 @@ src_configure() { |
| 100 |
local mycmakeargs=( |
| 101 |
-DSTLINK_UDEV_RULES_DIR="$(get_udevdir)"/rules.d |
| 102 |
-DSTLINK_MODPROBED_DIR="${EPREFIX}/etc/modprobe.d" |
| 103 |
+ -DLIB_INSTALL_DIR:PATH="$(get_libdir)" |
| 104 |
) |
| 105 |
|
| 106 |
cmake-utils_src_configure |
Archives