[oe,meta-python,V2] python-m2crypto: Upgrade to 0.26.0

Message ID 20170823015319.8326-1-raj.khem@gmail.com
State New
Headers show

Commit Message

Khem Raj Aug. 23, 2017, 1:53 a.m.
Use proper LICENCE file for LIC_FILES_CHKSUM
Update homepage to point to gitlab

Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 ...{python-m2crypto_0.25.1.bb => python-m2crypto_0.26.0.bb} | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
 rename meta-python/recipes-devtools/python/{python-m2crypto_0.25.1.bb => python-m2crypto_0.26.0.bb} (72%)

-- 
2.14.1

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Comments

Martin Jansa Aug. 28, 2017, 9:05 a.m. | #1
Unfortunately still fails to build:

http://errors.yoctoproject.org/Errors/Details/154230/

On Wed, Aug 23, 2017 at 3:53 AM, Khem Raj <raj.khem@gmail.com> wrote:

> Use proper LICENCE file for LIC_FILES_CHKSUM

> Update homepage to point to gitlab

>

> Signed-off-by: Khem Raj <raj.khem@gmail.com>

> ---

>  ...{python-m2crypto_0.25.1.bb => python-m2crypto_0.26.0.bb} | 13

> ++++++-------

>  1 file changed, 6 insertions(+), 7 deletions(-)

>  rename meta-python/recipes-devtools/python/{python-m2crypto_0.25.1.bb =>

> python-m2crypto_0.26.0.bb} (72%)

>

> diff --git a/meta-python/recipes-devtools/python/python-m2crypto_0.25.1.bb

> b/meta-python/recipes-devtools/python/python-m2crypto_0.26.0.bb

> similarity index 72%

> rename from meta-python/recipes-devtools/python/python-m2crypto_0.25.1.bb

> rename to meta-python/recipes-devtools/python/python-m2crypto_0.26.0.bb

> index 72523bd7f..1a5be8e2c 100644

> --- a/meta-python/recipes-devtools/python/python-m2crypto_0.25.1.bb

> +++ b/meta-python/recipes-devtools/python/python-m2crypto_0.26.0.bb

> @@ -1,13 +1,12 @@

>  SUMMARY = "A Python crypto and SSL toolkit"

> -HOMEPAGE = "http://chandlerproject.org/bin/view/Projects/MeTooCrypto"

> +HOMEPAGE = "https://gitlab.com/m2crypto/m2crypto"

>

>  LICENSE = "BSD"

> -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=95295693f047bb8f76928251a6154a60"

> -

> -SRC_URI[md5sum] = "040234289fbef5bed4029f0f7d1dae35"

> -SRC_URI[sha256sum] = "ac303a1881307a51c85ee8b1d87844

> d9866ee823b4fdbc52f7e79187c2d9acef"

> +LIC_FILES_CHKSUM = "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e"

>

>  SRC_URI += "file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch

> "

> +SRC_URI[md5sum] = "9f02f0b88fbe225cc6ea8680945cafa0"

> +SRC_URI[sha256sum] = "05d94fd9b2dae2fb8e072819a795f0

> e05d3611b09ea185f68e1630530ec09ae8"

>

>  PYPI_PACKAGE = "M2Crypto"

>  inherit pypi setuptools siteinfo

> @@ -18,8 +17,6 @@ RDEPENDS_${PN} += "python-typing"

>  DISTUTILS_BUILD_ARGS += "build_ext --openssl=${STAGING_DIR_HOST}

> -I${STAGING_INCDIR}"

>  DISTUTILS_INSTALL_ARGS += "build_ext --openssl=${STAGING_DIR_HOST}"

>

> -inherit setuptools

> -

>  SWIG_FEATURES_x86-64 = "-D__x86_64__"

>  SWIG_FEATURES ?= ""

>  export SWIG_FEATURES

> @@ -28,6 +25,8 @@ export SWIG_FEATURES

>  # multilib header file exists.

>  #

>  do_compile_prepend() {

> +    ${CPP} -dM - < /dev/null | grep -v __STDC__ | grep -v

> __REGISTER_PREFIX__ | grep -v __GNUC__ \

> +       | sed 's/^\(#define \([^ ]*\) .*\)$/#undef \2\n\1/' >

> SWIG/gcc_macros.h

>      if [ "${SITEINFO_BITS}" = "64" ];then

>          bit="64"

>      else

> --

> 2.14.1

>

> --

> _______________________________________________

> Openembedded-devel mailing list

> Openembedded-devel@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

>

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-python/recipes-devtools/python/python-m2crypto_0.25.1.bb b/meta-python/recipes-devtools/python/python-m2crypto_0.26.0.bb
similarity index 72%
rename from meta-python/recipes-devtools/python/python-m2crypto_0.25.1.bb
rename to meta-python/recipes-devtools/python/python-m2crypto_0.26.0.bb
index 72523bd7f..1a5be8e2c 100644
--- a/meta-python/recipes-devtools/python/python-m2crypto_0.25.1.bb
+++ b/meta-python/recipes-devtools/python/python-m2crypto_0.26.0.bb
@@ -1,13 +1,12 @@ 
 SUMMARY = "A Python crypto and SSL toolkit"
-HOMEPAGE = "http://chandlerproject.org/bin/view/Projects/MeTooCrypto"
+HOMEPAGE = "https://gitlab.com/m2crypto/m2crypto"
 
 LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=95295693f047bb8f76928251a6154a60"
-
-SRC_URI[md5sum] = "040234289fbef5bed4029f0f7d1dae35"
-SRC_URI[sha256sum] = "ac303a1881307a51c85ee8b1d87844d9866ee823b4fdbc52f7e79187c2d9acef"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e"
 
 SRC_URI += "file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch "
+SRC_URI[md5sum] = "9f02f0b88fbe225cc6ea8680945cafa0"
+SRC_URI[sha256sum] = "05d94fd9b2dae2fb8e072819a795f0e05d3611b09ea185f68e1630530ec09ae8"
 
 PYPI_PACKAGE = "M2Crypto"
 inherit pypi setuptools siteinfo
@@ -18,8 +17,6 @@  RDEPENDS_${PN} += "python-typing"
 DISTUTILS_BUILD_ARGS += "build_ext --openssl=${STAGING_DIR_HOST} -I${STAGING_INCDIR}"
 DISTUTILS_INSTALL_ARGS += "build_ext --openssl=${STAGING_DIR_HOST}"
 
-inherit setuptools
-
 SWIG_FEATURES_x86-64 = "-D__x86_64__"
 SWIG_FEATURES ?= ""
 export SWIG_FEATURES
@@ -28,6 +25,8 @@  export SWIG_FEATURES
 # multilib header file exists.
 #
 do_compile_prepend() {
+    ${CPP} -dM - < /dev/null | grep -v __STDC__ | grep -v __REGISTER_PREFIX__ | grep -v __GNUC__ \
+	| sed 's/^\(#define \([^ ]*\) .*\)$/#undef \2\n\1/' > SWIG/gcc_macros.h
     if [ "${SITEINFO_BITS}" = "64" ];then
         bit="64"
     else