From 758e012537b1f1bc64234817c4b950f65e63ca18 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 20 Aug 2015 10:31:15 +0200 Subject: [PATCH] micropython: update to 1.4.5. --- .../patches/micropython-no-git.patch | 33 ------------------- srcpkgs/micropython/template | 8 ++--- 2 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 srcpkgs/micropython/patches/micropython-no-git.patch diff --git a/srcpkgs/micropython/patches/micropython-no-git.patch b/srcpkgs/micropython/patches/micropython-no-git.patch deleted file mode 100644 index 73f2e0fa1bd..00000000000 --- a/srcpkgs/micropython/patches/micropython-no-git.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git py/makeversionhdr.py py/makeversionhdr.py -index e37496d..7d81ecb 100644 ---- py/makeversionhdr.py -+++ py/makeversionhdr.py -@@ -5,26 +5,10 @@ from __future__ import print_function - import sys - import os - import datetime --import subprocess - - def make_version_header(filename): -- # Note: git describe doesn't work if no tag is available -- try: -- git_tag = subprocess.check_output(["git", "describe", "--dirty", "--always"], universal_newlines=True).strip() -- except subprocess.CalledProcessError: -- git_tag = "" -- try: -- git_hash = subprocess.check_output(["git", "rev-parse", "--short", "HEAD"], stderr=subprocess.STDOUT, universal_newlines=True).strip() -- except subprocess.CalledProcessError: -- git_hash = "unknown" -- -- try: -- # Check if there are any modified files. -- subprocess.check_call(["git", "diff", "--no-ext-diff", "--quiet", "--exit-code"], stderr=subprocess.STDOUT) -- # Check if there are any staged files. -- subprocess.check_call(["git", "diff-index", "--cached", "--quiet", "HEAD", "--"], stderr=subprocess.STDOUT) -- except subprocess.CalledProcessError: -- git_hash += "-dirty" -+ git_tag = "v1.4.3" -+ git_hash = "d7b7d5f" - - # Try to extract MicroPython version from git tag - if git_tag.startswith("v"): diff --git a/srcpkgs/micropython/template b/srcpkgs/micropython/template index 2a969ca3518..cddb9f66a3d 100644 --- a/srcpkgs/micropython/template +++ b/srcpkgs/micropython/template @@ -1,22 +1,22 @@ # Template file for 'micropython' pkgname=micropython -version=1.4.3 +version=1.4.5 revision=1 build_wrksrc=unix -hostmakedepends="pkg-config python3.4" +hostmakedepends="pkg-config python python3.4" makedepends="libffi-devel readline-devel" short_desc="Implementation of Python 3.x for microcontrollers" maintainer="necrophcodr " license="MIT" homepage="http://micropython.org/" distfiles="http://github.com/micropython/micropython/archive/v${version}.tar.gz" -checksum=09ac1f38fb881bb1942e1a17cf519f692ed78d732403d96586ae76c9c597fa63 +checksum=46c4968f1b66219e2c7efb69f2eaea52224e62c51b1759a9d98e9af917bda576 pre_configure() { sed -i 's|-Werror||;/^COPT =/d' Makefile } do_build() { - make ${makejobs} V=1 PYTHON=python3.4 \ + make V=1 PYTHON=python3.4 \ CC=$CC CFLAGS_EXTRA="$CPPFLAGS $CFLAGS" \ LDFLAGS_EXTRA="$LDFLAGS" STRIP=echo }