From: Mark Corbin <mark.corbin@embecosm.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/libftdi1: fix swig build error when using cmake 3.12
Date: Sun, 23 Dec 2018 19:57:14 +0000 [thread overview]
Message-ID: <20181223195714.17155-1-mark.corbin@embecosm.com> (raw)
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>
---
package/libftdi1/0004-cmake-find-swig.patch | 26 +++++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 package/libftdi1/0004-cmake-find-swig.patch
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 )
--
2.19.1
next reply other threads:[~2018-12-23 19:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-23 19:57 Mark Corbin [this message]
2018-12-23 21:29 ` [Buildroot] [PATCH 1/1] package/libftdi1: fix swig build error when using cmake 3.12 Yann E. MORIN
2018-12-26 21:18 ` Thomas Petazzoni
2018-12-26 21:30 ` Yann E. MORIN
2018-12-26 21:17 ` Thomas Petazzoni
2019-01-18 13:03 ` Peter Korsgaard
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=20181223195714.17155-1-mark.corbin@embecosm.com \
--to=mark.corbin@embecosm.com \
--cc=buildroot@busybox.net \
/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