summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>2019-03-05 18:00:53 +0100
committerAaron Bauman <bman@gentoo.org>2019-03-11 00:46:44 -0400
commitcae520dea064dfd3309cd1959c38be57ea94520e (patch)
treeef6f993e05976fc044f3b2c152996b21e10fe250
parentdev-util/ninja: remove unused patch(es) (diff)
downloadgentoo-cae520dea064dfd3309cd1959c38be57ea94520e.tar.gz
gentoo-cae520dea064dfd3309cd1959c38be57ea94520e.tar.bz2
gentoo-cae520dea064dfd3309cd1959c38be57ea94520e.zip
dev-embedded/stlink: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/11277 Signed-off-by: Aaron Bauman <bman@gentoo.org>
-rw-r--r--dev-embedded/stlink/files/stlink-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch50
1 files changed, 0 insertions, 50 deletions
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
deleted file mode 100644
index aa077c0823bd..000000000000
--- a/dev-embedded/stlink/files/stlink-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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
-