Gentoo Archives: gentoo-commits

From: Sven Wegener <swegener@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/libftdi/, dev-embedded/libftdi/files/
Date: Sat, 19 Dec 2015 16:01:17
Message-Id: 1450540744.d8344da95467382d33df0c3aa727162f46b6e75b.swegener@gentoo
1 commit: d8344da95467382d33df0c3aa727162f46b6e75b
2 Author: Sven Wegener <swegener <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 19 15:49:03 2015 +0000
4 Commit: Sven Wegener <swegener <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 19 15:59:04 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8344da9
7
8 dev-embedded/libftdi: Fix cmake build issue with USE=examples, bug #566856
9
10 Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>
11
12 .../libftdi/files/libftdi-0.20-cmake-include.patch | 22 ++++++++++++++++++++++
13 dev-embedded/libftdi/libftdi-0.20.ebuild | 4 +++-
14 2 files changed, 25 insertions(+), 1 deletion(-)
15
16 diff --git a/dev-embedded/libftdi/files/libftdi-0.20-cmake-include.patch b/dev-embedded/libftdi/files/libftdi-0.20-cmake-include.patch
17 new file mode 100644
18 index 0000000..4faf7c6
19 --- /dev/null
20 +++ b/dev-embedded/libftdi/files/libftdi-0.20-cmake-include.patch
21 @@ -0,0 +1,22 @@
22 +From ccbd6cf1934056386772debba8583bc9b3721072 Mon Sep 17 00:00:00 2001
23 +From: Uffe Jakobsen <uffe@××××.org>
24 +Date: Mon, 22 Oct 2012 12:03:22 +0200
25 +Subject: [PATCH] Fix build on FreeBSD (cmake file typo)
26 +
27 +---
28 + examples/CMakeLists.txt | 2 +-
29 + 1 file changed, 1 insertion(+), 1 deletion(-)
30 +
31 +diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
32 +index 6793d89..1263c62 100644
33 +--- a/examples/CMakeLists.txt
34 ++++ b/examples/CMakeLists.txt
35 +@@ -2,7 +2,7 @@ option(EXAMPLES "Build example programs" ON)
36 +
37 + if (EXAMPLES)
38 + # Includes
39 +- include( ${CMAKE_CURRENT_SOURCE_DIR}
40 ++ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}
41 + ${CMAKE_CURRENT_BINARY_DIR}
42 + )
43 +
44
45 diff --git a/dev-embedded/libftdi/libftdi-0.20.ebuild b/dev-embedded/libftdi/libftdi-0.20.ebuild
46 index a5804f3..acc14c0 100644
47 --- a/dev-embedded/libftdi/libftdi-0.20.ebuild
48 +++ b/dev-embedded/libftdi/libftdi-0.20.ebuild
49 @@ -4,7 +4,7 @@
50
51 EAPI="2"
52
53 -inherit cmake-utils python
54 +inherit cmake-utils python eutils
55
56 if [[ ${PV} == 9999* ]] ; then
57 EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
58 @@ -34,6 +34,8 @@ src_prepare() {
59 sed -i \
60 -e '/SET(LIB_SUFFIX /d' \
61 CMakeLists.txt || die
62 +
63 + epatch "${FILESDIR}"/${P}-cmake-include.patch
64 }
65
66 src_configure() {