Skip to contentSkip to conversation

package/libftdi1: fix swig build error when using cmake 3.12

PATCH New Mark Corbin 4 participants 6 messages Dec 23, 2018 – Jan 18, 2019

lore
Share & tools
lore

Mark Corbin

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 package/libftdi1/0004-cmake-find-swig.patch | 26 +++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 package/libftdi1/0004-cmake-find-swig.patch
package/libftdi1/0004-cmake-find-swig.patch new file +26 -0
new file mode 100644
index 0000000000..25922cca53
@@ -0,0 +1,26 @@
+From fcda9c6a208d3a7fe651ef661b2eb6e462a89c17 Mon Sep 17 00:00:00 2001
+From: Eneas U de Queiroz <[email protected]>
+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 <[email protected]>
+[Mark: patch retrieved and updated from
+http://developer.intra2net.com/git/?p=libftdi;a=commit;h=fcda9c6a208d3a7fe651ef661b2eb6e462a89c17]
+Signed-off-by: Mark Corbin <[email protected]>
+---
+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 )
Signature · 1 line
2.19.1
#1 lore raw

PATCH 1/1 package/libftdi1: fix swig build error when using cmake 3.12

Mark, All,

On 2018-12-23 19:57 +0000, Mark Corbin spake thusly:

Quoted 2 lines

The build fails with 'Unable to find' swig.swg and python.swg when using cmake version 3.12.

We've another user on IRC, reporting issues with cmake-3.13. Should we now black=list cmake 3.12 and above, and always build our own?

Did you try to investigate and find the change in cmake that caused this regression?

Quoted 6 lines

This commit adds a patch from upstream libftdi.

Fixes:
http://autobuild.buildroot.net/results/cc54fec0cd6e35e99dde2f43e0eb28b9d628cd19

Signed-off-by Mark Corbin <[email protected]>

This is indeed an adaptation of an upstream libftdi1 commit.

Reviewed-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 44 lines
---
 package/libftdi1/0004-cmake-find-swig.patch | 26 +++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 package/libftdi1/0004-cmake-find-swig.patch
package/libftdi1/0004-cmake-find-swig.patch new file +26 -0
new file mode 100644
index 0000000000..25922cca53
@@ -0,0 +1,26 @@
+From fcda9c6a208d3a7fe651ef661b2eb6e462a89c17 Mon Sep 17 00:00:00 2001
+From: Eneas U de Queiroz <[email protected]>
+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 <[email protected]>
+[Mark: patch retrieved and updated from
+http://developer.intra2net.com/git/?p=libftdi;a=commit;h=fcda9c6a208d3a7fe651ef661b2eb6e462a89c17]
+Signed-off-by: Mark Corbin <[email protected]>
+---
+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 )
Signature · 6 lines
2.19.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 package/libftdi1: fix swig build error when using cmake 3.12

Hello,

Quoted 2 lines · Yann E. MORIN

We've another user on IRC, reporting issues with cmake-3.13. Should we now black=list cmake 3.12 and above, and always build our own?

I really don't like blacklisting recent versions of tools. So if we were to blacklist CMake 3.13 and newer, I'd like to see a proper explanation of what the problem is and why blacklisting CMake 3.13 and newer is the only reasonable solution.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 1/1 package/libftdi1: fix swig build error when using cmake 3.12

Thomas, All,

On 2018-12-26 22:18 +0100, Thomas Petazzoni spake thusly:

Quoted 8 lines · Yann E. MORIN
Quoted 2 lines

We've another user on IRC, reporting issues with cmake-3.13. Should we now black=list cmake 3.12 and above, and always build our own?

I really don't like blacklisting recent versions of tools. So if we were to blacklist CMake 3.13 and newer, I'd like to see a proper explanation of what the problem is and why blacklisting CMake 3.13 and newer is the only reasonable solution.

100% agreed.

Let's put this at rest until we have proper explanation and reproducer.

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
Applied
#4 lore raw

PATCH 1/1 package/libftdi1: fix swig build error when using cmake 3.12

In reply to Mark Corbin

Hello,

Quoted 5 lines · Mark Corbin

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.

Quoted 8 lines

Fixes:
http://autobuild.buildroot.net/results/cc54fec0cd6e35e99dde2f43e0eb28b9d628cd19

Signed-off-by Mark Corbin <[email protected]>
---
 package/libftdi1/0004-cmake-find-swig.patch | 26 +++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 package/libftdi1/0004-cmake-find-swig.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#5 lore raw

PATCH 1/1 package/libftdi1: fix swig build error when using cmake 3.12

In reply to Mark Corbin
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Mark" == Mark Corbin <[email protected]> writes:

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 <[email protected]>

Committed to 2018.02.x and 2018.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard