public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sven Wegener" <swegener@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/libftdi/, dev-embedded/libftdi/files/
Date: Sat, 19 Dec 2015 16:01:11 +0000 (UTC)	[thread overview]
Message-ID: <1450540744.d8344da95467382d33df0c3aa727162f46b6e75b.swegener@gentoo> (raw)

commit:     d8344da95467382d33df0c3aa727162f46b6e75b
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 19 15:49:03 2015 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 15:59:04 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8344da9

dev-embedded/libftdi: Fix cmake build issue with USE=examples, bug #566856

Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>

 .../libftdi/files/libftdi-0.20-cmake-include.patch | 22 ++++++++++++++++++++++
 dev-embedded/libftdi/libftdi-0.20.ebuild           |  4 +++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/dev-embedded/libftdi/files/libftdi-0.20-cmake-include.patch b/dev-embedded/libftdi/files/libftdi-0.20-cmake-include.patch
new file mode 100644
index 0000000..4faf7c6
--- /dev/null
+++ b/dev-embedded/libftdi/files/libftdi-0.20-cmake-include.patch
@@ -0,0 +1,22 @@
+From ccbd6cf1934056386772debba8583bc9b3721072 Mon Sep 17 00:00:00 2001
+From: Uffe Jakobsen <uffe@uffe.org>
+Date: Mon, 22 Oct 2012 12:03:22 +0200
+Subject: [PATCH] Fix build on FreeBSD (cmake file typo)
+
+---
+ examples/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
+index 6793d89..1263c62 100644
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -2,7 +2,7 @@ option(EXAMPLES "Build example programs" ON)
+ 
+ if (EXAMPLES)
+     # Includes
+-    include( ${CMAKE_CURRENT_SOURCE_DIR}
++    include_directories( ${CMAKE_CURRENT_SOURCE_DIR}
+             ${CMAKE_CURRENT_BINARY_DIR}
+             )
+ 

diff --git a/dev-embedded/libftdi/libftdi-0.20.ebuild b/dev-embedded/libftdi/libftdi-0.20.ebuild
index a5804f3..acc14c0 100644
--- a/dev-embedded/libftdi/libftdi-0.20.ebuild
+++ b/dev-embedded/libftdi/libftdi-0.20.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit cmake-utils python
+inherit cmake-utils python eutils
 
 if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
@@ -34,6 +34,8 @@ src_prepare() {
 	sed -i \
 		-e '/SET(LIB_SUFFIX /d' \
 		CMakeLists.txt || die
+
+	epatch "${FILESDIR}"/${P}-cmake-include.patch
 }
 
 src_configure() {


             reply	other threads:[~2015-12-19 16:01 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-19 16:01 Sven Wegener [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-06-14  3:57 [gentoo-commits] repo/gentoo:master commit in: dev-embedded/libftdi/, dev-embedded/libftdi/files/ Sam James

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1450540744.d8344da95467382d33df0c3aa727162f46b6e75b.swegener@gentoo \
    --to=swegener@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox