Sat Jan 6 23:06:27 2018 UTC ()
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


(spz)
diff -r1.6 -r1.6.2.1 pkgsrc/lang/micropython/distinfo
diff -r0 -r1.1.2.2 pkgsrc/lang/micropython/patches/patch-py_nlrx64.c
cvs diff -r1.6 -r1.6.2.1 pkgsrc/lang/micropython/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/micropython/distinfo 2017/11/30 14:41:30 1.6
+++ pkgsrc/lang/micropython/distinfo 2018/01/06 23:06:27 1.6.2.1
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.6 2017/11/30 14:41:30 hauke Exp $ 1$NetBSD: distinfo,v 1.6.2.1 2018/01/06 23:06:27 spz Exp $
2 2
3SHA1 (micropython-1.9.2/micropython-1.9.2.tar.xz) = c14b2e7ebaefe86e60f4b11cf738947cf8204fba 3SHA1 (micropython-1.9.2/micropython-1.9.2.tar.xz) = c14b2e7ebaefe86e60f4b11cf738947cf8204fba
4RMD160 (micropython-1.9.2/micropython-1.9.2.tar.xz) = 9c22131546c3e49bfa28b5f71994b20ee819d094 4RMD160 (micropython-1.9.2/micropython-1.9.2.tar.xz) = 9c22131546c3e49bfa28b5f71994b20ee819d094
5SHA512 (micropython-1.9.2/micropython-1.9.2.tar.xz) = 67d070d47c19a100d164f9b4e4ec7eba10cf5ee49089f5f4d6a8338a9d72d6cffa41c2f6de73c8b169ba8011961b8ef197241fa5bea6813f77f65ef4cf2f4e4b 5SHA512 (micropython-1.9.2/micropython-1.9.2.tar.xz) = 67d070d47c19a100d164f9b4e4ec7eba10cf5ee49089f5f4d6a8338a9d72d6cffa41c2f6de73c8b169ba8011961b8ef197241fa5bea6813f77f65ef4cf2f4e4b
6Size (micropython-1.9.2/micropython-1.9.2.tar.xz) = 6699860 bytes 6Size (micropython-1.9.2/micropython-1.9.2.tar.xz) = 6699860 bytes
7SHA1 (patch-lib_utils_printf.c) = 6c152cd10a5fb0091d1149a0a50b202df6a6e931 7SHA1 (patch-lib_utils_printf.c) = 6c152cd10a5fb0091d1149a0a50b202df6a6e931
8SHA1 (patch-mpy-cross_mpconfigport.h) = 78cf0865c60bf8fbbecb318e4f0597662076459e 8SHA1 (patch-mpy-cross_mpconfigport.h) = 78cf0865c60bf8fbbecb318e4f0597662076459e
9SHA1 (patch-py_mkenv.mk) = ff844cd4bcb6f9a2a27e02a62a066b4b70899c88 9SHA1 (patch-py_mkenv.mk) = ff844cd4bcb6f9a2a27e02a62a066b4b70899c88
 10SHA1 (patch-py_nlrx64.c) = 3aa81065c6357e42ff6a659f7b198d95711c5b2f
10SHA1 (patch-unix_Makefile) = 459483caf54b9180f67bd07bbfa7fcf6088de1cc 11SHA1 (patch-unix_Makefile) = 459483caf54b9180f67bd07bbfa7fcf6088de1cc
11SHA1 (patch-unix_main.c) = 8c199a25aaf5bef34a86754b1e492554903dad5b 12SHA1 (patch-unix_main.c) = 8c199a25aaf5bef34a86754b1e492554903dad5b
12SHA1 (patch-unix_mpconfigport.h) = 544c0217ffcc8755adbb8c63a4b325af9b7ff8a2 13SHA1 (patch-unix_mpconfigport.h) = 544c0217ffcc8755adbb8c63a4b325af9b7ff8a2
13SHA1 (patch-unix_mpthreadport.c) = 5a021a4b1b7426ea7bae302870a04008381ee9c7 14SHA1 (patch-unix_mpthreadport.c) = 5a021a4b1b7426ea7bae302870a04008381ee9c7
File Added: pkgsrc/lang/micropython/patches/patch-py_nlrx64.c
$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);