diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
| commit | b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch) | |
| tree | 9fd110f9fc996e8a4213eeda994a8c112491b86d /dev-embedded/stlink | |
| parent | 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff) | |
gentoo resync : 19.03.2019
Diffstat (limited to 'dev-embedded/stlink')
| -rw-r--r-- | dev-embedded/stlink/Manifest | 1 | ||||
| -rw-r--r-- | dev-embedded/stlink/files/stlink-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch | 50 |
2 files changed, 0 insertions, 51 deletions
diff --git a/dev-embedded/stlink/Manifest b/dev-embedded/stlink/Manifest index 6e6418dca8ff..ed084668e962 100644 --- a/dev-embedded/stlink/Manifest +++ b/dev-embedded/stlink/Manifest @@ -1,4 +1,3 @@ -AUX stlink-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch 1760 BLAKE2B b6f195ec18c1886dc561a85bea9792eedada56e9744f51af92f6dfb9f3303f3b6f038afcd60456462ffdc689d283e38f73a5058c8b4774257048f67976fc3407 SHA512 604a0c6e18dbd5a7645a2edc17754d8e6fce4f4d7fa595da1fa52c8e0c8178fcabe163195575e35c07933b04a5804d154b74fed19caec9c92427374905ddf0d0 DIST stlink-1.5.1.tar.gz 190182 BLAKE2B eaea0fbfb7ca3a42e3519e4a5568f254ef57c6223241b4dbeb116a2b1c54e960868bac5249774cfb84869ceb1e6d457d0fe449e682c566ba928ffa32ab1ff88e SHA512 cabf7f6f5a6f3655206694f21162e0d9ac663bea07354186836695da888f2ddebe3871ea56580d1d4781d4c3dbf8a8459ab87ccbcd6f181f8e651ef58e22a372 EBUILD stlink-1.5.1.ebuild 806 BLAKE2B ae1aecdd003aaf55a4258466f6cd5847695687a2a2ff80e94e3674d754c39871dcf57488c89ba82911a197326c30aa0ab3d95671479b3b99c9ef0be87834679f SHA512 8bebb062305871ca0bfa11a501b5e81a9cac2ab73435126d44db64435b97fa19b54a07dc44a381fb0ab5bb40c2ccf1677897290fa0c5d38f8564176c0d428542 EBUILD stlink-9999.ebuild 798 BLAKE2B d9f16816c4e8e9eef92b8645520b5b69761d15c4519196fc2bd773d55022236f4baf61b1b32f4ba302b90120639bb46ac29d9087e7a86e5ee8bcc15b3b535c8c SHA512 5cf360edbf4d74654389bd14c3ce1ffd30f70a19ec79b43bb8e4ba433a024e5deb96e6ca62c6052c6e2cfeb7566ed16f801e9b66330394d92373132718c76dcc 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 - |