From 1f61a96fa6454a5d981691d38612627590ab5d4d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 17 May 2019 11:29:44 +0000 Subject: [PATCH] python-pyproj: upgrade to 1.9.6 and use pypi.bbclass * newer version is needed to fix build with newer python-3.7: _proj.c:7421:21: error: 'PyThreadState' {aka 'struct _ts'} has no member named 'exc_type'; did you mean 'curexc_type'? *type = tstate->exc_type; ^~~~~~~~ curexc_type * see https://github.com/pyproj4/pyproj/issues/138 https://github.com/pyproj4/pyproj/issues/136 * and pypi.bbclass is needed to fetch the source from files.pythonhosted.org, the old pypi.python.org/packages/source doesn't have the new releases * the newest version is 2.1.3, but that needs a bit more changes like: DEPENDS += "${PYTHON_PN}-cython-native" and then it still fails with: | Proj executable not found. Please set PROJ_DIR variable. | ERROR: 'python3 setup.py build ' execution failed. will probably need native pyproj as well, I'll leave that to someone actually using pyproj (I was just fixing the build error detected in bitbake world with Yocto 2.7 Warrior). Signed-off-by: Martin Jansa --- recipes-devtools/python/python-pyproj.inc | 14 +++++++------- ...on-pyproj_1.9.5.1.bb => python-pyproj_1.9.6.bb} | 0 ...3-pyproj_1.9.5.1.bb => python3-pyproj_1.9.6.bb} | 0 3 files changed, 7 insertions(+), 7 deletions(-) rename recipes-devtools/python/{python-pyproj_1.9.5.1.bb => python-pyproj_1.9.6.bb} (100%) rename recipes-devtools/python/{python3-pyproj_1.9.5.1.bb => python3-pyproj_1.9.6.bb} (100%) diff --git a/recipes-devtools/python/python-pyproj.inc b/recipes-devtools/python/python-pyproj.inc index b742f65..076667c 100644 --- a/recipes-devtools/python/python-pyproj.inc +++ b/recipes-devtools/python/python-pyproj.inc @@ -1,12 +1,12 @@ +inherit pypi +PYPI_PACKAGE = "pyproj" + DESCRIPTION = "Python interface to PROJ.4 library" SECTION = "devel/python" LICENSE = "ISC & MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=77d9726a341183ab262b28b3d66dfd94 \ - file://LICENSE_proj4;md5=74d9aaec5fa0cd734341e8c4dc91b608" -SRCNAME = "pyproj" + file://LICENSE_proj4;md5=74d9aaec5fa0cd734341e8c4dc91b608 \ +" -SRC_URI = "http://pypi.python.org/packages/source/p/pyproj/pyproj-${PV}.tar.gz" -SRC_URI[md5sum] = "027345e3c033fa400e0e64a1c80d34c9" -SRC_URI[sha256sum] = "53fa54c8fa8a1dfcd6af4bf09ce1aae5d4d949da63b90570ac5ec849efaf3ea8" - -S = "${WORKDIR}/${SRCNAME}-${PV}" +SRC_URI[md5sum] = "0f02376d59f796108e6e36db42f773c8" +SRC_URI[sha256sum] = "e0c02b1554b20c710d16d673817b2a89ff94738b0b537aead8ecb2edc4c4487b" diff --git a/recipes-devtools/python/python-pyproj_1.9.5.1.bb b/recipes-devtools/python/python-pyproj_1.9.6.bb similarity index 100% rename from recipes-devtools/python/python-pyproj_1.9.5.1.bb rename to recipes-devtools/python/python-pyproj_1.9.6.bb diff --git a/recipes-devtools/python/python3-pyproj_1.9.5.1.bb b/recipes-devtools/python/python3-pyproj_1.9.6.bb similarity index 100% rename from recipes-devtools/python/python3-pyproj_1.9.5.1.bb rename to recipes-devtools/python/python3-pyproj_1.9.6.bb