CVS commit: [pkgsrc-2017Q4] pkgsrc/lang/micropython

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Sat Jan  6 23:06:27 UTC 2018

Modified Files:
        pkgsrc/lang/micropython [pkgsrc-2017Q4]: distinfo
Added Files:
        pkgsrc/lang/micropython/patches [pkgsrc-2017Q4]: patch-py_nlrx64.c

Log Message:
Pullup ticket #5672 - requested by dholland
lang/micropython: build fix

Revisions pulled up:
- lang/micropython/distinfo                                     1.7
- lang/micropython/patches/patch-py_nlrx64.c                    1.1

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        dholland
   Date:                Mon Jan  1 00:47:42 UTC 2018

   Modified Files:
        pkgsrc/lang/micropython: distinfo
   Added Files:
        pkgsrc/lang/micropython/patches: patch-py_nlrx64.c

   Log Message:
   Remove illegal cpp abuse that fails the clang build.

   To generate a diff of this commit:
   cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/micropython/distinfo
   cvs rdiff -u -r0 -r1.1 pkgsrc/lang/micropython/patches/patch-py_nlrx64.c


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.2.1 pkgsrc/lang/micropython/distinfo
cvs rdiff -u -r0 -r1.1.2.2 pkgsrc/lang/micropython/patches/patch-py_nlrx64.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/micropython/distinfo
diff -u pkgsrc/lang/micropython/distinfo:1.6 pkgsrc/lang/micropython/distinfo:1.6.2.1
--- pkgsrc/lang/micropython/distinfo:1.6        Thu Nov 30 14:41:30 2017
+++ pkgsrc/lang/micropython/distinfo    Sat Jan  6 23:06:27 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2017/11/30 14:41:30 hauke Exp $
+$NetBSD: distinfo,v 1.6.2.1 2018/01/06 23:06:27 spz Exp $
 
 SHA1 (micropython-1.9.2/micropython-1.9.2.tar.xz) = c14b2e7ebaefe86e60f4b11cf738947cf8204fba
 RMD160 (micropython-1.9.2/micropython-1.9.2.tar.xz) = 9c22131546c3e49bfa28b5f71994b20ee819d094
@@ -7,6 +7,7 @@ Size (micropython-1.9.2/micropython-1.9.
 SHA1 (patch-lib_utils_printf.c) = 6c152cd10a5fb0091d1149a0a50b202df6a6e931
 SHA1 (patch-mpy-cross_mpconfigport.h) = 78cf0865c60bf8fbbecb318e4f0597662076459e
 SHA1 (patch-py_mkenv.mk) = ff844cd4bcb6f9a2a27e02a62a066b4b70899c88
+SHA1 (patch-py_nlrx64.c) = 3aa81065c6357e42ff6a659f7b198d95711c5b2f
 SHA1 (patch-unix_Makefile) = 459483caf54b9180f67bd07bbfa7fcf6088de1cc
 SHA1 (patch-unix_main.c) = 8c199a25aaf5bef34a86754b1e492554903dad5b
 SHA1 (patch-unix_mpconfigport.h) = 544c0217ffcc8755adbb8c63a4b325af9b7ff8a2

Added files:

Index: pkgsrc/lang/micropython/patches/patch-py_nlrx64.c
diff -u /dev/null pkgsrc/lang/micropython/patches/patch-py_nlrx64.c:1.1.2.2
--- /dev/null   Sat Jan  6 23:06:27 2018
+++ pkgsrc/lang/micropython/patches/patch-py_nlrx64.c   Sat Jan  6 23:06:27 2018
@@ -0,0 +1,19 @@
+$NetBSD: patch-py_nlrx64.c,v 1.1.2.2 2018/01/06 23:06:27 spz Exp $
+
+Remove illegal cpp abuse that fails the clang build.
+
+--- py/nlrx64.c~       2017-08-23 01:50:10.000000000 +0000
++++ py/nlrx64.c
+@@ -34,7 +34,11 @@
+ // x86-64 callee-save registers are:
+ //  rbx, rbp, rsp, r12, r13, r14, r15
+ 
+-#define NLR_OS_WINDOWS (defined(_WIN32) || defined(__CYGWIN__))
++#if (defined(_WIN32) || defined(__CYGWIN__))
++#define NLR_OS_WINDOWS 1
++#else
++#define NLR_OS_WINDOWS 0
++#endif
+ 
+ __attribute__((used)) unsigned int nlr_push_tail(nlr_buf_t *nlr);
+