diff --git a/fix-aarch64-builds.patch b/fix-aarch64-builds.patch deleted file mode 100644 index e4c8ffd..0000000 --- a/fix-aarch64-builds.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Marian Buschsieweke -Date: Tue, 30 Mar 2021 20:08:11 +0200 -Subject: [PATCH] unix/main: Make static variable that's potentially clobbered - by longjmp. - -This fixes `error: variable 'subpkg_tried' might be clobbered by 'longjmp' -or 'vfork' [-Werror=clobbered]` when compiling on ppc64le and aarch64 (and -possibly other architectures/toolchains). ---- - ports/unix/main.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/ports/unix/main.c b/ports/unix/main.c -index 129c6d3bb..e33c1742d 100644 ---- a/ports/unix/main.c -+++ b/ports/unix/main.c -@@ -596,7 +596,12 @@ MP_NOINLINE int main_(int argc, char **argv) { - - mp_obj_t mod; - nlr_buf_t nlr; -- bool subpkg_tried = false; -+ -+ // Allocating subpkg_tried on the stack can lead to compiler warnings about this -+ // variable being clobbered when nlr is implemented using setjmp/longjmp. Its -+ // value must be preserved across calls to setjmp/longjmp. -+ static bool subpkg_tried; -+ subpkg_tried = false; - - reimport: - if (nlr_push(&nlr) == 0) { --- -2.31.1 - diff --git a/micropython-1.14.tar.xz b/micropython-1.14.tar.xz deleted file mode 100644 index 87a494c..0000000 --- a/micropython-1.14.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97306156fdeab120a1244626c75a929bb820722afdfc1317dbd5dadef388d94c -size 56801160 diff --git a/micropython-1.15.tar.xz b/micropython-1.15.tar.xz new file mode 100644 index 0000000..a2d4c66 --- /dev/null +++ b/micropython-1.15.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52d020b3adef6c2bd2b6c8aba672f381c3c99d2b90130ac8d0d7414999cb4e13 +size 56937276 diff --git a/micropython.changes b/micropython.changes index 6821586..9b066c0 100644 --- a/micropython.changes +++ b/micropython.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri May 7 09:50:45 UTC 2021 - Mustafa Çalışkan + +- Update to version 1.15: + * Full release notes: https://github.com/micropython/micropython/releases/tag/v1.15 + * Unix port updates: + - mpbtstackport_common: implement mp_bluetooth_hci_active + - moduselect: don't allow both posix and non-posix configurations + - improve command line argument processing + - main: make static variable that's potentially clobbered by longjm +- Remove patch fix-aarch64-builds.patch +- Exclude ppc64 and ppc64le as build fails for those architectures + ------------------------------------------------------------------- Sat Apr 17 03:06:16 UTC 2021 - Mustafa Çalışkan diff --git a/micropython.spec b/micropython.spec index e16aa01..8b11774 100644 --- a/micropython.spec +++ b/micropython.spec @@ -17,28 +17,26 @@ Name: micropython -Version: 1.14 +Version: 1.15 Release: 0 Summary: Implementation of Python 3 with very low memory footprint License: MIT Group: Development/Languages/Python URL: https://micropython.org/ Source: https://micropython.org/resources/source/%{name}-%{version}.tar.xz -Patch: fix-aarch64-builds.patch BuildRequires: openssl BuildRequires: python BuildRequires: python3 BuildRequires: readline-devel BuildRequires: pkgconfig(libffi) Recommends: micropython-lib -ExcludeArch: %{ix86} %{arm} +ExcludeArch: %{ix86} %{arm} ppc64 ppc64le %description A lean and efficient Python implementation for microcontrollers and constrained systems %prep %setup -q -%patch -p1 sed -i -e "s:/usr/lib/micropython:%{_prefix}/lib/micropython:g" "ports/unix/main.c" %define make_flags V=1 MICROPY_PY_BTREE=0 MICROPY_PY_USSL=0 @@ -51,7 +49,8 @@ sed -i -e "s:/usr/lib/micropython:%{_prefix}/lib/micropython:g" "ports/unix/main install -d %{buildroot}%{_bindir} install -t %{buildroot}%{_bindir} ports/unix/micropython -%ifnarch aarch64 +%ifnarch aarch64 s390x +# s390x: 3 tests failes: float_parse float_parse_doubleprec ffi_callback # aarch64: 2 tests failed: float_parse float_parse_doubleprec # https://github.com/micropython/micropython/issues/4176 %check @@ -60,7 +59,6 @@ make -C ports/unix PYTHON=%{__python3} V=1 test %endif %files -%defattr(-,root,root) %license LICENSE %doc docs/unix/* %{_bindir}/micropython