diff options
| author | Mark Corbin <mark.corbin@embecosm.com> | 2018-12-23 19:57:14 +0000 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2018-12-26 22:15:28 +0100 |
| commit | f5e81203144ce9d8f8acb69de38c487b2bbe398f (patch) | |
| tree | 8e92636dc3cc9e144bda0ca6a210e45b8b2d9e0e /package/libftdi1 | |
| parent | 0b213d5a38361408dd82b3c61bf31e6d7efee61e (diff) | |
| download | buildroot-f5e81203144ce9d8f8acb69de38c487b2bbe398f.tar.gz buildroot-f5e81203144ce9d8f8acb69de38c487b2bbe398f.zip | |
package/libftdi1: fix swig build error when using cmake 3.12
The build fails with 'Unable to find' swig.swg and python.swg when
using cmake version 3.12.
This commit adds a patch from upstream libftdi.
Fixes:
http://autobuild.buildroot.net/results/cc54fec0cd6e35e99dde2f43e0eb28b9d628cd19
Signed-off-by: Mark Corbin <mark.corbin@embecosm.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'package/libftdi1')
| -rw-r--r-- | package/libftdi1/0004-cmake-find-swig.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/package/libftdi1/0004-cmake-find-swig.patch b/package/libftdi1/0004-cmake-find-swig.patch new file mode 100644 index 0000000000..25922cca53 --- /dev/null +++ b/package/libftdi1/0004-cmake-find-swig.patch @@ -0,0 +1,26 @@ +From fcda9c6a208d3a7fe651ef661b2eb6e462a89c17 Mon Sep 17 00:00:00 2001 +From: Eneas U de Queiroz <cote2004-github@yahoo.com> +Date: Tue, 31 Jul 2018 17:44:57 -0300 +Subject: [PATCH] CMake: use find_package (SWIG) for cmake >= 3.0.0 + +There's a workaround for a bug (fixed in cmake 3.0.0) that does not +work in CMake 3.12. Only use the workaround with cmake < 3.0.0. + +Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com> +[Mark: patch retrieved and updated from +http://developer.intra2net.com/git/?p=libftdi;a=commit;h=fcda9c6a208d3a7fe651ef661b2eb6e462a89c17] +Signed-off-by: Mark Corbin <mark.corbin@embecosm.com> +--- +diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt +index 31ef1c6..eefc344 100644 +--- a/python/CMakeLists.txt ++++ b/python/CMakeLists.txt +@@ -3,7 +3,7 @@ option ( LINK_PYTHON_LIBRARY "Link against python libraries" ON ) + + if ( PYTHON_BINDINGS ) + # workaround for cmake bug #0013449 +- if ( NOT DEFINED CMAKE_FIND_ROOT_PATH ) ++ if ( NOT DEFINED CMAKE_FIND_ROOT_PATH OR CMAKE_VERSION VERSION_GREATER_EQUAL 3.0.0 ) + find_package ( SWIG ) + else () + find_program ( SWIG_EXECUTABLE NAMES swig2.0 swig ) |
