diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-embedded/stlink | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-embedded/stlink')
-rw-r--r-- | dev-embedded/stlink/Manifest | 7 | ||||
-rw-r--r-- | dev-embedded/stlink/files/stlink-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch | 50 | ||||
-rw-r--r-- | dev-embedded/stlink/metadata.xml | 8 | ||||
-rw-r--r-- | dev-embedded/stlink/stlink-1.4.0.ebuild | 39 | ||||
-rw-r--r-- | dev-embedded/stlink/stlink-1.5.0.ebuild | 36 | ||||
-rw-r--r-- | dev-embedded/stlink/stlink-9999.ebuild | 36 |
6 files changed, 176 insertions, 0 deletions
diff --git a/dev-embedded/stlink/Manifest b/dev-embedded/stlink/Manifest new file mode 100644 index 000000000000..edd1c95d8595 --- /dev/null +++ b/dev-embedded/stlink/Manifest @@ -0,0 +1,7 @@ +AUX stlink-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch 1760 BLAKE2B b6f195ec18c1886dc561a85bea9792eedada56e9744f51af92f6dfb9f3303f3b6f038afcd60456462ffdc689d283e38f73a5058c8b4774257048f67976fc3407 SHA512 604a0c6e18dbd5a7645a2edc17754d8e6fce4f4d7fa595da1fa52c8e0c8178fcabe163195575e35c07933b04a5804d154b74fed19caec9c92427374905ddf0d0 +DIST stlink-1.4.0.tar.gz 138765 BLAKE2B e7dddd51e4ff0c0342b3df62a10b33736acf6380afc449e3ac7d67b607bc217df05b02ddcfed73d83190b9a5cb02f5f1d01beaab5de5f3cd92214fd916793b9e SHA512 cb7617068a6dcaf7e8d0ccfb8b918f0373f6120398dab40a8b8d6567705871226684fd19aad92e4bab623310a5da13ea9fd70153b619f58d3534f0a4ff3a9886 +DIST stlink-1.5.0.tar.gz 140484 BLAKE2B fa6f0a770ccc77629e4edcbd1a6112f8917ac84c00693756d4905b92c5ba83f445193e65c37cda5e5942605bb3da0fa6a6833af52d9572c73b0796ece754ffad SHA512 0e93c0fdcd377c6f2d452b9b6fa00b741dc0dd906673773ef09185aca4f63930db61e137bb28c47e34218edca9f7a80cd05352fb8f9d8e50b000c779cc36580a +EBUILD stlink-1.4.0.ebuild 929 BLAKE2B 86439a1906feff17d6e0e3d89b33fa3c1824d8e0394b3a02d8fa3f66f03bfc75a9af3f7c1c9a24e9e1bec0666af27ded2e7d020d24ecfe226b686775aaed3743 SHA512 7d9b220d6dd5729b5b5756946d7f53b7595ceabad627cd8b03cbd782d42569c565b0d554cd970e11363ba2018e13f361bf9f465ee9d43304125f997d31550c20 +EBUILD stlink-1.5.0.ebuild 798 BLAKE2B 10185c4888c117b2d65cd6ec4e7456e35c253ba6dcd2976140323bb20a65df4bbd675d2d1bcc2baf1b4860eea1fc4ca72cb935dfe36f957065d25814fe54e43e SHA512 2443b473bcc0c32570cc98cd2a1046e77d6fd9684a056c756aea5c53fc29280f14d6784bb49deba9037bc3e07c3b2eeefccee1398b45a9175ab47a342878e696 +EBUILD stlink-9999.ebuild 798 BLAKE2B d9f16816c4e8e9eef92b8645520b5b69761d15c4519196fc2bd773d55022236f4baf61b1b32f4ba302b90120639bb46ac29d9087e7a86e5ee8bcc15b3b535c8c SHA512 5cf360edbf4d74654389bd14c3ce1ffd30f70a19ec79b43bb8e4ba433a024e5deb96e6ca62c6052c6e2cfeb7566ed16f801e9b66330394d92373132718c76dcc +MISC metadata.xml 248 BLAKE2B 946598a9bc9f658d98c3282fd6affeb3834a4b6071beca852a2f2381d5c17799b6ed17ed427a8f6e10fb3f715cdf2aad9e4fed2886f0dd67dacfdffcd5137f80 SHA512 89d637e180ed3a2c2096be2210633dc5df0760a7d6acd7b2d2ad8a06d473943ee86bad7e74c7df238a50168d1da8044471713e9b044007b9c2f4eb604fb710d5 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 index 000000000000..aa077c0823bd --- /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/metadata.xml b/dev-embedded/stlink/metadata.xml new file mode 100644 index 000000000000..086586c08a88 --- /dev/null +++ b/dev-embedded/stlink/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>alexxy@gentoo.org</email> + <name>Alexey Shvetsov</name> + </maintainer> +</pkgmetadata> diff --git a/dev-embedded/stlink/stlink-1.4.0.ebuild b/dev-embedded/stlink/stlink-1.4.0.ebuild new file mode 100644 index 000000000000..c349f40b793c --- /dev/null +++ b/dev-embedded/stlink/stlink-1.4.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit cmake-utils udev + +DESCRIPTION="stm32 discovery line linux programmer" +HOMEPAGE="https://github.com/texane/stlink" +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/texane/stlink.git" + inherit git-r3 +else + SRC_URI="https://github.com/texane/stlink/archive/${PV}/${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="virtual/libusb:1 + >=dev-libs/glib-2.32.0:2 + x11-libs/gtk+:3" +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-1.5.0.ebuild b/dev-embedded/stlink/stlink-1.5.0.ebuild new file mode 100644 index 000000000000..b733c93f5a36 --- /dev/null +++ b/dev-embedded/stlink/stlink-1.5.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit cmake-utils udev + +DESCRIPTION="stm32 discovery line linux programmer" +HOMEPAGE="https://github.com/texane/stlink" +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/texane/stlink.git" + inherit git-r3 +else + SRC_URI="https://github.com/texane/stlink/archive/${PV}/${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="virtual/libusb:1 + >=dev-libs/glib-2.32.0:2 + x11-libs/gtk+:3" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +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 new file mode 100644 index 000000000000..479ca67cd591 --- /dev/null +++ b/dev-embedded/stlink/stlink-9999.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit cmake-utils udev + +DESCRIPTION="stm32 discovery line linux programmer" +HOMEPAGE="https://github.com/texane/stlink" +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/texane/stlink.git" + inherit git-r3 +else + SRC_URI="https://github.com/texane/stlink/archive/${PV}/${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="virtual/libusb:1 + >=dev-libs/glib-2.32.0:2 + x11-libs/gtk+:3" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +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 +} |