mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
libftdi: cpp-wrapper fix cmake support
Backport fix for C++ wrapper cmake support. Signed-off-by: Denis Osterland-Heim <denis.osterland@diehl.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
9e57cd65cc
commit
d51084073d
|
|
@ -0,0 +1,45 @@
|
|||
From cdb28383402d248dbc6062f4391b038375c52385 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Fri, 17 Jul 2020 21:25:03 +0200
|
||||
Subject: [PATCH] CMakeLists.txt: fix paths when FTDIPP is set
|
||||
|
||||
Use the same project name (i.e. libftdi1 and not libftdipp1) when FTDIPP
|
||||
is enabled as suggested by Aurelien Jarno in
|
||||
http://developer.intra2net.com/mailarchive/html/libftdi/2020/msg00044.html
|
||||
|
||||
Without this change, the libftdi1.pc config file defines the include
|
||||
path as /usr/local/include/libftdipp1 while the ftdi.h file is actually
|
||||
installed in /usr/local/include/libftdi1
|
||||
|
||||
This is an issue for example for libsigrok which will fail on:
|
||||
|
||||
In file included from src/hardware/asix-sigma/protocol.c:27:
|
||||
src/hardware/asix-sigma/protocol.h:28:10: fatal error: ftdi.h: No such file or directory
|
||||
28 | #include <ftdi.h>
|
||||
| ^~~~~~~~
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/1427f44e36752c337791597fab47a1889552a2fe
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Upstream-Status: Backport [http://developer.intra2net.com/git/?p=libftdi;a=patch;h=cdb28383402d248dbc6062f4391b038375c52385]
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 5aecafc..3b0b87c 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -136,7 +136,7 @@ endif ()
|
||||
|
||||
add_subdirectory(src)
|
||||
if ( FTDIPP )
|
||||
- project(libftdipp1 C CXX)
|
||||
+ project(libftdi1 C CXX)
|
||||
add_subdirectory(ftdipp)
|
||||
endif ()
|
||||
if ( PYTHON_BINDINGS )
|
||||
--
|
||||
1.7.1
|
||||
|
||||
|
|
@ -11,7 +11,10 @@ LIC_FILES_CHKSUM = "\
|
|||
|
||||
DEPENDS = "libusb1 python3 swig-native"
|
||||
|
||||
SRC_URI = "http://www.intra2net.com/en/developer/${BPN}/download/${BPN}1-${PV}.tar.bz2"
|
||||
SRC_URI = "\
|
||||
http://www.intra2net.com/en/developer/${BPN}/download/${BPN}1-${PV}.tar.bz2 \
|
||||
file://CMakeLists-txt-fix-paths-when-FTDIPP-is-set.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "7c7091e9c86196148bd41177b4590dccb1510bfe6cea5bf7407ff194482eb049"
|
||||
|
||||
UPSTREAM_CHECK_URI = "http://www.intra2net.com/en/developer/libftdi/download.php"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user