| 1 |
commit: cce4f7dd97738aa11023f07b8279b86112b1fb63 |
| 2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
| 3 |
AuthorDate: Mon Dec 28 15:17:05 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 28 15:17:05 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cce4f7dd |
| 7 |
|
| 8 |
dev-embedded/libftdi: Disable static libs in 1.5 and 9999 |
| 9 |
|
| 10 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
| 11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-embedded/libftdi/libftdi-1.5.ebuild | 16 +++++++--------- |
| 14 |
dev-embedded/libftdi/libftdi-9999.ebuild | 12 ++++++------ |
| 15 |
2 files changed, 13 insertions(+), 15 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-embedded/libftdi/libftdi-1.5.ebuild b/dev-embedded/libftdi/libftdi-1.5.ebuild |
| 18 |
index d5d1fe18543..cd5cc4c3539 100644 |
| 19 |
--- a/dev-embedded/libftdi/libftdi-1.5.ebuild |
| 20 |
+++ b/dev-embedded/libftdi/libftdi-1.5.ebuild |
| 21 |
@@ -3,7 +3,7 @@ |
| 22 |
|
| 23 |
EAPI=7 |
| 24 |
|
| 25 |
-PYTHON_COMPAT=( python3_{6,7,8,9} ) |
| 26 |
+PYTHON_COMPAT=( python3_{6..9} ) |
| 27 |
inherit cmake python-single-r1 |
| 28 |
|
| 29 |
MY_P="${PN}1-${PV}" |
| 30 |
@@ -21,15 +21,15 @@ S="${WORKDIR}/${MY_P}" |
| 31 |
|
| 32 |
LICENSE="LGPL-2" |
| 33 |
SLOT="1" |
| 34 |
-IUSE="cxx doc examples python static-libs test tools" |
| 35 |
+IUSE="cxx doc examples python test tools" |
| 36 |
RESTRICT="!test? ( test )" |
| 37 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 38 |
|
| 39 |
BDEPEND=" |
| 40 |
doc? ( app-doc/doxygen ) |
| 41 |
- python? ( dev-lang/swig ) |
| 42 |
-" |
| 43 |
-RDEPEND="virtual/libusb:1 |
| 44 |
+ python? ( dev-lang/swig )" |
| 45 |
+RDEPEND=" |
| 46 |
+ virtual/libusb:1 |
| 47 |
cxx? ( dev-libs/boost ) |
| 48 |
python? ( ${PYTHON_DEPS} ) |
| 49 |
tools? ( |
| 50 |
@@ -40,9 +40,7 @@ DEPEND="${RDEPEND} |
| 51 |
test? ( dev-libs/boost ) |
| 52 |
" |
| 53 |
|
| 54 |
-PATCHES=( |
| 55 |
- "${FILESDIR}/${P}-tests-no-cxx.patch" |
| 56 |
-) |
| 57 |
+PATCHES=( "${FILESDIR}"/${P}-tests-no-cxx.patch ) |
| 58 |
|
| 59 |
pkg_setup() { |
| 60 |
use python && python-single-r1_pkg_setup |
| 61 |
@@ -54,10 +52,10 @@ src_configure() { |
| 62 |
-DDOCUMENTATION=$(usex doc) |
| 63 |
-DEXAMPLES=$(usex examples) |
| 64 |
-DPYTHON_BINDINGS=$(usex python) |
| 65 |
- -DSTATICLIBS=$(usex static-libs) |
| 66 |
-DBUILD_TESTS=$(usex test) |
| 67 |
-DFTDI_EEPROM=$(usex tools) |
| 68 |
-DCMAKE_SKIP_BUILD_RPATH=ON |
| 69 |
+ -DSTATICLIBS=OFF |
| 70 |
) |
| 71 |
cmake_src_configure |
| 72 |
} |
| 73 |
|
| 74 |
diff --git a/dev-embedded/libftdi/libftdi-9999.ebuild b/dev-embedded/libftdi/libftdi-9999.ebuild |
| 75 |
index ac06a98e918..984ebde256d 100644 |
| 76 |
--- a/dev-embedded/libftdi/libftdi-9999.ebuild |
| 77 |
+++ b/dev-embedded/libftdi/libftdi-9999.ebuild |
| 78 |
@@ -3,7 +3,7 @@ |
| 79 |
|
| 80 |
EAPI=7 |
| 81 |
|
| 82 |
-PYTHON_COMPAT=( python3_{6,7,8,9} ) |
| 83 |
+PYTHON_COMPAT=( python3_{6..9} ) |
| 84 |
inherit cmake python-single-r1 |
| 85 |
|
| 86 |
MY_P="${PN}1-${PV}" |
| 87 |
@@ -21,15 +21,15 @@ S="${WORKDIR}/${MY_P}" |
| 88 |
|
| 89 |
LICENSE="LGPL-2" |
| 90 |
SLOT="1" |
| 91 |
-IUSE="cxx doc examples python static-libs test tools" |
| 92 |
+IUSE="cxx doc examples python test tools" |
| 93 |
RESTRICT="!test? ( test )" |
| 94 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 95 |
|
| 96 |
BDEPEND=" |
| 97 |
doc? ( app-doc/doxygen ) |
| 98 |
- python? ( dev-lang/swig ) |
| 99 |
-" |
| 100 |
-RDEPEND="virtual/libusb:1 |
| 101 |
+ python? ( dev-lang/swig )" |
| 102 |
+RDEPEND=" |
| 103 |
+ virtual/libusb:1 |
| 104 |
cxx? ( dev-libs/boost ) |
| 105 |
python? ( ${PYTHON_DEPS} ) |
| 106 |
tools? ( |
| 107 |
@@ -50,10 +50,10 @@ src_configure() { |
| 108 |
-DDOCUMENTATION=$(usex doc) |
| 109 |
-DEXAMPLES=$(usex examples) |
| 110 |
-DPYTHON_BINDINGS=$(usex python) |
| 111 |
- -DSTATICLIBS=$(usex static-libs) |
| 112 |
-DBUILD_TESTS=$(usex test) |
| 113 |
-DFTDI_EEPROM=$(usex tools) |
| 114 |
-DCMAKE_SKIP_BUILD_RPATH=ON |
| 115 |
+ -DSTATICLIBS=OFF |
| 116 |
) |
| 117 |
cmake_src_configure |
| 118 |
} |
Archives