Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/stlink/files/
Date: Mon, 11 Mar 2019 04:48:17
Message-Id: 1552279604.cae520dea064dfd3309cd1959c38be57ea94520e.bman@gentoo
1 commit: cae520dea064dfd3309cd1959c38be57ea94520e
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Tue Mar 5 17:00:53 2019 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 11 04:46:44 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cae520de
7
8 dev-embedded/stlink: remove unused patch(es)
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Closes: https://github.com/gentoo/gentoo/pull/11277
12 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
13
14 ...ink-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch | 50 ----------------------
15 1 file changed, 50 deletions(-)
16
17 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
18 deleted file mode 100644
19 index aa077c0823b..00000000000
20 --- a/dev-embedded/stlink/files/stlink-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch
21 +++ /dev/null
22 @@ -1,50 +0,0 @@
23 -From cbba564f60bacd30344f9bb5c7bebaf8283b6794 Mon Sep 17 00:00:00 2001
24 -From: Vasiliy Glazov <vascom2@×××××.com>
25 -Date: Fri, 8 Sep 2017 15:00:45 +0300
26 -Subject: [PATCH] Added LIB_INSTALL_DIR to correct libs install on 64-bit
27 - systems (#636)
28 -
29 -* Added LIB_INSTALL_DIR to correct libs install on 64-bit systems
30 -* Add description for using LIB_INSTALL_DIR parameter.
31 ----
32 - CMakeLists.txt | 3 ++-
33 - doc/compiling.md | 9 +++++++++
34 - 2 files changed, 11 insertions(+), 1 deletion(-)
35 -
36 -diff --git a/CMakeLists.txt b/CMakeLists.txt
37 -index 46790de..da99b6e 100644
38 ---- a/CMakeLists.txt
39 -+++ b/CMakeLists.txt
40 -@@ -4,7 +4,8 @@ project(stlink C)
41 - set(PROJECT_DESCRIPTION "Open source version of the STMicroelectronics Stlink Tools")
42 - set(STLINK_UDEV_RULES_DIR "/etc/udev/rules.d" CACHE PATH "Udev rules directory")
43 - set(STLINK_MODPROBED_DIR "/etc/modprobe.d" CACHE PATH "modprobe.d directory")
44 --set(STLINK_LIBRARY_PATH "lib/${CMAKE_LIBRARY_PATH}" CACHE PATH "Target lib directory")
45 -+set(LIB_INSTALL_DIR "lib" CACHE PATH "Main library directory")
46 -+set(STLINK_LIBRARY_PATH "${LIB_INSTALL_DIR}/${CMAKE_LIBRARY_PATH}" CACHE PATH "Target lib directory")
47 -
48 - option(STLINK_GENERATE_MANPAGES "Generate manpages with pandoc" OFF)
49 -
50 -diff --git a/doc/compiling.md b/doc/compiling.md
51 -index 3518d10..41d1fb7 100644
52 ---- a/doc/compiling.md
53 -+++ b/doc/compiling.md
54 -@@ -118,6 +118,15 @@ $ cmake -DSTLINK_UDEV_RULES_DIR="/usr/lib/udev/rules.d" \
55 - -DSTLINK_MODPROBED_DIR="/usr/lib/modprobe.d" ..
56 - ```
57 -
58 -+## Build using different directory for shared libs
59 -+
60 -+To put the compiled shared libs into a different directory during installation
61 -+you can use the following cmake option:
62 -+
63 -+```
64 -+$ cmake -DLIB_INSTALL_DIR:PATH="/usr/lib64" ..
65 -+```
66 -+
67 - ## Windows (MinGW64)
68 -
69 - ### Prequistes
70 ---
71 -2.13.6
72 -