Skip to contentSkip to conversation

package/mpython-m2crypto: bump version

PATCH New Yann E. MORIN 2 participants 3 messages Dec 6, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/mpython-m2crypto: bump version

---
This fixes a lot of autobuild failures since -next was merged back into master. But since autobuild.buildroot.org is unreachable from here, no autobuild ref was added to the commit log.
YEM.

---
 package/python-m2crypto/python-m2crypto.hash | 4 ++--
 package/python-m2crypto/python-m2crypto.mk   | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)
package/python-m2crypto/python-m2crypto.hash +2 -2
index a5231ec..a2603b9 100644
@@ -1,2 +1,2 @@
-# From https://pypi.python.org/pypi/M2Crypto/0.21.1
-md5 f93d8462ff7646397a9f77a2fe602d17 M2Crypto-0.21.1.tar.gz
+# From https://pypi.python.org/pypi/M2Crypto/0.22.5
+md5 f84eb07aa1687f39bc26ee7b1ba5a105 M2Crypto-0.22.5.tar.gz
package/python-m2crypto/python-m2crypto.mk +7 -1
index 7e46f1d..1f038e3 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PYTHON_M2CRYPTO_VERSION = 0.21.1
+PYTHON_M2CRYPTO_VERSION = 0.22.5
 PYTHON_M2CRYPTO_SITE = http://pypi.python.org/packages/source/M/M2Crypto
 PYTHON_M2CRYPTO_SOURCE = M2Crypto-$(PYTHON_M2CRYPTO_VERSION).tar.gz
 PYTHON_M2CRYPTO_SETUP_TYPE = setuptools
@@ -13,10 +13,16 @@ HOST_PYTHON_M2CRYPTO_DEPENDENCIES = host-openssl host-swig
 # We need to use python2 because m2crypto is not python3 compliant.
 HOST_PYTHON_M2CRYPTO_NEEDS_HOST_PYTHON = python2
 
+HOST_PYTHON_M2CRYPTO_BUILD_DIR = $(@D)/build/lib.linux-$(HOSTARCH)-$(PYTHON_VERSION_MAJOR)
+
 # * We need to override the build commands to be able to use build_ext,
 #   which accepts the --openssl option.
 # * Use python2 interpreter to avoid trying building some python3 objects.
+# * because build_ext is flawed, is forgets to copy the files prior to
+#   the build, so we do it manually.
 define HOST_PYTHON_M2CRYPTO_BUILD_CMDS
+	mkdir -p $(HOST_PYTHON_M2CRYPTO_BUILD_DIR)
+	cp -av $(@D)/M2Crypto $(HOST_PYTHON_M2CRYPTO_BUILD_DIR)/M2Crypto
 	(cd $(@D); \
 		$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) \
 		$(HOST_DIR)/usr/bin/python2 setup.py build_ext \
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 package/mpython-m2crypto: bump version

All,

On 2015-12-06 17:35 +0100, Yann E. MORIN spake thusly:

Quoted 5 lines

---
This fixes a lot of autobuild failures since -next was merged back into master. But since autobuild.buildroot.org is unreachable from here, no autobuild ref was added to the commit log.

I could eventually connect via the humanoidz alias:

    http://autobuild.humanoidz.org/?reason=crda-3.18
    http://autobuild.humanoidz.org/results/ee1/ee1bb80214a51c212712de8193b89a32e9901408/
    http://autobuild.humanoidz.org/results/ce8/ce8d5d68eef312ca168f351b845920eb62ca4eb1/
    http://autobuild.humanoidz.org/results/500/5004a2a9cabe75669bbe90f3ee35ab3869617fc9/

and so on...

Regards,
Yann E. MORIN.

Quoted 49 lines

YEM.

---
 package/python-m2crypto/python-m2crypto.hash | 4 ++--
 package/python-m2crypto/python-m2crypto.mk   | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)
package/python-m2crypto/python-m2crypto.hash +2 -2
index a5231ec..a2603b9 100644
@@ -1,2 +1,2 @@
-# From https://pypi.python.org/pypi/M2Crypto/0.21.1
-md5 f93d8462ff7646397a9f77a2fe602d17 M2Crypto-0.21.1.tar.gz
+# From https://pypi.python.org/pypi/M2Crypto/0.22.5
+md5 f84eb07aa1687f39bc26ee7b1ba5a105 M2Crypto-0.22.5.tar.gz
package/python-m2crypto/python-m2crypto.mk +7 -1
index 7e46f1d..1f038e3 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PYTHON_M2CRYPTO_VERSION = 0.21.1
+PYTHON_M2CRYPTO_VERSION = 0.22.5
 PYTHON_M2CRYPTO_SITE = http://pypi.python.org/packages/source/M/M2Crypto
 PYTHON_M2CRYPTO_SOURCE = M2Crypto-$(PYTHON_M2CRYPTO_VERSION).tar.gz
 PYTHON_M2CRYPTO_SETUP_TYPE = setuptools
@@ -13,10 +13,16 @@ HOST_PYTHON_M2CRYPTO_DEPENDENCIES = host-openssl host-swig
 # We need to use python2 because m2crypto is not python3 compliant.
 HOST_PYTHON_M2CRYPTO_NEEDS_HOST_PYTHON = python2
 
+HOST_PYTHON_M2CRYPTO_BUILD_DIR = $(@D)/build/lib.linux-$(HOSTARCH)-$(PYTHON_VERSION_MAJOR)
+
 # * We need to override the build commands to be able to use build_ext,
 #   which accepts the --openssl option.
 # * Use python2 interpreter to avoid trying building some python3 objects.
+# * because build_ext is flawed, is forgets to copy the files prior to
+#   the build, so we do it manually.
 define HOST_PYTHON_M2CRYPTO_BUILD_CMDS
+	mkdir -p $(HOST_PYTHON_M2CRYPTO_BUILD_DIR)
+	cp -av $(@D)/M2Crypto $(HOST_PYTHON_M2CRYPTO_BUILD_DIR)/M2Crypto
 	(cd $(@D); \
 		$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) \
 		$(HOST_DIR)/usr/bin/python2 setup.py build_ext \
Signature · 1 line
1.9.1
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/mpython-m2crypto: bump version

In reply to Yann E. MORIN
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

---
This fixes a lot of autobuild failures since -next was merged back into master. But since autobuild.buildroot.org is unreachable from here, no autobuild ref was added to the commit log.
YEM.

Committed with the autobuilder references added, thanks.

Signature · 1 line
Bye, Peter Korsgaard