Skip to contentSkip to conversation

libftdi1: fix python build with cmake < 3.7

PATCH Superseded Fabrice Fontaine 2 participants 3 messages Jan 19, 2019 – Jan 20, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libftdi1: fix python build with cmake < 3.7

Fixes:
- http://autobuild.buildroot.org/results/1091872e2b77d789e361d1ddefd235c738933c55

---
 ...n-CMakeLists.txt-fix-build-with-cmake-3.7.patch | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 package/libftdi1/0005-python-CMakeLists.txt-fix-build-with-cmake-3.7.patch
package/libftdi1/0005-python-CMakeLists.txt-fix-build-with-cmake-3.7.patch new file +34 -0
new file mode 100644
index 0000000000..c9fcb0ee4f
@@ -0,0 +1,34 @@
+From ddfbe611fd273ea6a0c1ac86c184fa8b395fa2fe Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Sat, 19 Jan 2019 21:09:22 +0100
+Subject: [PATCH] python/CMakeLists.txt: fix build with cmake < 3.7
+
+VERSION_GREATER_EQUAL has been added only in cmake 3.7:
+https://cmake.org/cmake/help/v3.7/release/3.7.html
+
+So replace this statement by NOT CMAKE_VERSION VERSION_LESS
+
+Fixes:
+ - http://autobuild.buildroot.org/results/1091872e2b77d789e361d1ddefd235c738933c55
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Upstream status:
+http://developer.intra2net.com/mailarchive/html/libftdi/2019/msg00009.html]
+---
+ python/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
+index 7bdd9f9..376dae6 100644
+--- a/python/CMakeLists.txt
++++ b/python/CMakeLists.txt
+@@ -1,5 +1,5 @@
+   # workaround for cmake bug #0013449
+-  if ( NOT DEFINED CMAKE_FIND_ROOT_PATH OR CMAKE_VERSION VERSION_GREATER_EQUAL 3.0.0 )
++  if ( NOT DEFINED CMAKE_FIND_ROOT_PATH OR NOT CMAKE_VERSION VERSION_LESS 3.0.0 )
+     find_package ( SWIG )
+   else ()
+     find_program ( SWIG_EXECUTABLE NAMES swig2.0 swig )
+-- 
+2.14.1
+
Signature · 1 line
2.14.1
#1 lore raw

PATCH 1/1 libftdi1: fix python build with cmake < 3.7

Hi Fabrice,

Quoted 33 lines · Fabrice Fontaine

Fixes:
- http://autobuild.buildroot.org/results/1091872e2b77d789e361d1ddefd235c738933c55

---
 ...n-CMakeLists.txt-fix-build-with-cmake-3.7.patch | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 package/libftdi1/0005-python-CMakeLists.txt-fix-build-with-cmake-3.7.patch
package/libftdi1/0005-python-CMakeLists.txt-fix-build-with-cmake-3.7.patch new file +18 -0
new file mode 100644
index 0000000000..c9fcb0ee4f
@@ -0,0 +1,34 @@
+From ddfbe611fd273ea6a0c1ac86c184fa8b395fa2fe Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Sat, 19 Jan 2019 21:09:22 +0100
+Subject: [PATCH] python/CMakeLists.txt: fix build with cmake < 3.7
+
+VERSION_GREATER_EQUAL has been added only in cmake 3.7:
+https://cmake.org/cmake/help/v3.7/release/3.7.html
+
+So replace this statement by NOT CMAKE_VERSION VERSION_LESS
+
+Fixes:
+ - http://autobuild.buildroot.org/results/1091872e2b77d789e361d1ddefd235c738933c55
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Upstream status:
+http://developer.intra2net.com/mailarchive/html/libftdi/2019/msg00009.html]
+---
+ python/CMakeLists.txt | 2 +-

package/libftdi1/0005-python-CMakeLists.txt-fix-build-with-cmake-3.7.patch line 28

Quoted 10 lines
package/libftdi1/0005-python-CMakeLists.txt-fix-build-with-cmake-3.7.patch new file +10 -0
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
+index 7bdd9f9..376dae6 100644
+--- a/python/CMakeLists.txt
++++ b/python/CMakeLists.txt
+@@ -1,5 +1,5 @@
+   # workaround for cmake bug #0013449
+-  if ( NOT DEFINED CMAKE_FIND_ROOT_PATH OR CMAKE_VERSION VERSION_GREATER_EQUAL 3.0.0 )
++  if ( NOT DEFINED CMAKE_FIND_ROOT_PATH OR NOT CMAKE_VERSION VERSION_LESS 3.0.0 )

VERSION_GREATER_EQUAL is added in Buildroot patch 0004. Why not fix it there?

package/libftdi1/0005-python-CMakeLists.txt-fix-build-with-cmake-3.7.patch line 34

Quoted 6 lines
package/libftdi1/0005-python-CMakeLists.txt-fix-build-with-cmake-3.7.patch new file +6 -0
+     find_package ( SWIG )
+   else ()
+     find_program ( SWIG_EXECUTABLE NAMES swig2.0 swig )
+--
+2.14.1
+

baruch

--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

#2 lore raw

PATCH 1/1 libftdi1: fix python build with cmake < 3.7

Hi Baruch,

Le dim. 20 janv. 2019 ? 06:35, Baruch Siach <[email protected]> a ?crit :

Quoted 42 lines

Hi Fabrice,

Quoted 38 lines · Fabrice Fontaine

Fixes:
- http://autobuild.buildroot.org/results/1091872e2b77d789e361d1ddefd235c738933c55

---
 ...n-CMakeLists.txt-fix-build-with-cmake-3.7.patch | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 package/libftdi1/0005-python-CMakeLists.txt-fix-build-with-cmake-3.7.patch
package/libftdi1/0005-python-CMakeLists.txt-fix-build-with-cmake-3.7.patch new file +23 -0
new file mode 100644
index 0000000000..c9fcb0ee4f
@@ -0,0 +1,34 @@
+From ddfbe611fd273ea6a0c1ac86c184fa8b395fa2fe Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Sat, 19 Jan 2019 21:09:22 +0100
+Subject: [PATCH] python/CMakeLists.txt: fix build with cmake < 3.7
+
+VERSION_GREATER_EQUAL has been added only in cmake 3.7:
+https://cmake.org/cmake/help/v3.7/release/3.7.html
+
+So replace this statement by NOT CMAKE_VERSION VERSION_LESS
+
+Fixes:
+ - http://autobuild.buildroot.org/results/1091872e2b77d789e361d1ddefd235c738933c55
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Upstream status:
+http://developer.intra2net.com/mailarchive/html/libftdi/2019/msg00009.html]
+---
+ python/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
+index 7bdd9f9..376dae6 100644
+--- a/python/CMakeLists.txt
Quoted 8 lines

package/libftdi1/0005-python-CMakeLists.txt-fix-build-with-cmake-3.7.patch line 28

Quoted 5 lines
package/libftdi1/0005-python-CMakeLists.txt-fix-build-with-cmake-3.7.patch new file +5 -0
++++ b/python/CMakeLists.txt
+@@ -1,5 +1,5 @@
+   # workaround for cmake bug #0013449
+-  if ( NOT DEFINED CMAKE_FIND_ROOT_PATH OR CMAKE_VERSION VERSION_GREATER_EQUAL 3.0.0 )
++  if ( NOT DEFINED CMAKE_FIND_ROOT_PATH OR NOT CMAKE_VERSION VERSION_LESS 3.0.0 )

VERSION_GREATER_EQUAL is added in Buildroot patch 0004. Why not fix it there?

Indeed, I can fix the issue in patch 0004, I'll send a v2.

Quoted 8 lines

package/libftdi1/0005-python-CMakeLists.txt-fix-build-with-cmake-3.7.patch line 34

Quoted 7 lines
package/libftdi1/0005-python-CMakeLists.txt-fix-build-with-cmake-3.7.patch new file +6 -0
+     find_package ( SWIG )
+   else ()
+     find_program ( SWIG_EXECUTABLE NAMES swig2.0 swig )
+--
+2.14.1
+
Quoted 6 lines

baruch

--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

Best Regards,

Fabrice