summaryrefslogtreecommitdiffstats
path: root/meta-python/recipes-extended/python-pyparted/python3-pyparted
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2017-05-26 03:37:30 -0400
committerMartin Jansa <Martin.Jansa@gmail.com>2017-06-05 11:01:47 +0200
commitabc5a71c4d216742dc2af4b475136262ac169612 (patch)
tree2f5c60e63f45ffc89332034d5f15f946482fd94d /meta-python/recipes-extended/python-pyparted/python3-pyparted
parent0cf7b58745b1bc28d3affef49d5b56128287a576 (diff)
downloadmeta-openembedded-abc5a71c4d216742dc2af4b475136262ac169612.tar.gz
python3-pyparted: add a python3 recipe
- Split to a common python-pyparted.inc for python2 and python3 - Tweak 0001-fix-version-float-check.patch for python3 to fix do_compile errror ---- | ERROR: python3 setup.py build_ext execution failed. | Traceback (most recent call last): | File "setup.py", line 62, in <module> | check_mod_version('libparted', need_libparted_version) | File "setup.py", line 55, in check_mod_version | match = re.search('([0-9]+\.[0-9]+)', modversion) | File "work/core2-64-wrs-linux/python3-pyparted/3.10.7+gitAU TOINC+69c4a478e4-r0/recipe-sysroot-native/usr/lib/python3.5/re.py", line 173, in search | return _compile(pattern, flags).search(string) | TypeError: cannot use a string pattern on a bytes-like object ---- The reason is the return of subprocess.check_output is byte in python3, but string in python2 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-python/recipes-extended/python-pyparted/python3-pyparted')
-rw-r--r--meta-python/recipes-extended/python-pyparted/python3-pyparted/0001-fix-version-float-check.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/meta-python/recipes-extended/python-pyparted/python3-pyparted/0001-fix-version-float-check.patch b/meta-python/recipes-extended/python-pyparted/python3-pyparted/0001-fix-version-float-check.patch
new file mode 100644
index 0000000000..14fb0bb3e5
--- /dev/null
+++ b/meta-python/recipes-extended/python-pyparted/python3-pyparted/0001-fix-version-float-check.patch
@@ -0,0 +1,26 @@
1check_mod_version breaks if module version is of x.y.z form
2use a regex to help cast x.y.z version to a float
3
4Upstream-Status: Pending
5
6Index: git/setup.py
7===================================================================
8--- git.orig/setup.py
9+++ git/setup.py
10@@ -25,6 +25,7 @@ import glob
11 import os
12 import platform
13 import sys
14+import re
15 from distutils.ccompiler import new_compiler
16 from distutils.errors import CompileError
17 from distutils.errors import LinkError
18@@ -51,6 +52,8 @@ def pkgconfig(*packages, **kwargs):
19
20 def check_mod_version(module, version):
21 modversion = subprocess.check_output(["pkg-config", "--modversion", module])
22+ match = re.search(b'([0-9]+\.[0-9]+)', modversion)
23+ modversion = match.group(0)
24 if not float(modversion) >= float(version):
25 sys.stderr.write("*** Minimum required %s version: %s, found: %s\n" % (module, version, modversion,))
26 sys.exit(1)