diff options
Diffstat (limited to 'meta-oe/recipes-support/libftdi/files/CMakeLists-txt-fix-paths-when-FTDIPP-is-set.patch')
-rw-r--r-- | meta-oe/recipes-support/libftdi/files/CMakeLists-txt-fix-paths-when-FTDIPP-is-set.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/libftdi/files/CMakeLists-txt-fix-paths-when-FTDIPP-is-set.patch b/meta-oe/recipes-support/libftdi/files/CMakeLists-txt-fix-paths-when-FTDIPP-is-set.patch new file mode 100644 index 0000000000..b2735f8059 --- /dev/null +++ b/meta-oe/recipes-support/libftdi/files/CMakeLists-txt-fix-paths-when-FTDIPP-is-set.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From cdb28383402d248dbc6062f4391b038375c52385 Mon Sep 17 00:00:00 2001 | ||
2 | From: Fabrice Fontaine <fontaine.fabrice@gmail.com> | ||
3 | Date: Fri, 17 Jul 2020 21:25:03 +0200 | ||
4 | Subject: [PATCH] CMakeLists.txt: fix paths when FTDIPP is set | ||
5 | |||
6 | Use the same project name (i.e. libftdi1 and not libftdipp1) when FTDIPP | ||
7 | is enabled as suggested by Aurelien Jarno in | ||
8 | http://developer.intra2net.com/mailarchive/html/libftdi/2020/msg00044.html | ||
9 | |||
10 | Without this change, the libftdi1.pc config file defines the include | ||
11 | path as /usr/local/include/libftdipp1 while the ftdi.h file is actually | ||
12 | installed in /usr/local/include/libftdi1 | ||
13 | |||
14 | This is an issue for example for libsigrok which will fail on: | ||
15 | |||
16 | In file included from src/hardware/asix-sigma/protocol.c:27: | ||
17 | src/hardware/asix-sigma/protocol.h:28:10: fatal error: ftdi.h: No such file or directory | ||
18 | 28 | #include <ftdi.h> | ||
19 | | ^~~~~~~~ | ||
20 | |||
21 | Fixes: | ||
22 | - http://autobuild.buildroot.org/results/1427f44e36752c337791597fab47a1889552a2fe | ||
23 | |||
24 | Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> | ||
25 | Upstream-Status: Backport [http://developer.intra2net.com/git/?p=libftdi;a=patch;h=cdb28383402d248dbc6062f4391b038375c52385] | ||
26 | --- | ||
27 | CMakeLists.txt | 2 +- | ||
28 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
29 | |||
30 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
31 | index 5aecafc..3b0b87c 100644 | ||
32 | --- a/CMakeLists.txt | ||
33 | +++ b/CMakeLists.txt | ||
34 | @@ -136,7 +136,7 @@ endif () | ||
35 | |||
36 | add_subdirectory(src) | ||
37 | if ( FTDIPP ) | ||
38 | - project(libftdipp1 C CXX) | ||
39 | + project(libftdi1 C CXX) | ||
40 | add_subdirectory(ftdipp) | ||
41 | endif () | ||
42 | if ( PYTHON_BINDINGS ) | ||
43 | -- | ||
44 | 1.7.1 | ||
45 | |||