Fri Jul 16 09:48:45 2021 UTC ()
python36: Fix _decimal build on Darwin/aarch64.


(jperkin)
diff -r1.31 -r1.32 pkgsrc/lang/python36/Makefile
cvs diff -r1.31 -r1.32 pkgsrc/lang/python36/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python36/Attic/Makefile 2021/02/16 19:39:53 1.31
+++ pkgsrc/lang/python36/Attic/Makefile 2021/07/16 09:48:45 1.32
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.31 2021/02/16 19:39:53 adam Exp $ 1# $NetBSD: Makefile,v 1.32 2021/07/16 09:48:45 jperkin Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4 4
5PKGNAME= python36-${PY_DISTVERSION} 5PKGNAME= python36-${PY_DISTVERSION}
6CATEGORIES= lang python 6CATEGORIES= lang python
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.python.org/ 9HOMEPAGE= https://www.python.org/
10COMMENT= Interpreted, interactive, object-oriented programming language 10COMMENT= Interpreted, interactive, object-oriented programming language
11LICENSE= python-software-foundation 11LICENSE= python-software-foundation
12 12
13CONFLICTS+= python-[0-9]* 13CONFLICTS+= python-[0-9]*
14 14
@@ -66,26 +66,31 @@ PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME: @@ -66,26 +66,31 @@ PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:
66# ossaudiodev is only available on x86 for the following platforms 66# ossaudiodev is only available on x86 for the following platforms
67PLIST_VARS+= oss 67PLIST_VARS+= oss
68.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \ 68.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \
69 (${PY_PLATNAME} == "linux" || ${OPSYS} == "FreeBSD") 69 (${PY_PLATNAME} == "linux" || ${OPSYS} == "FreeBSD")
70PLIST.oss= yes 70PLIST.oss= yes
71.endif 71.endif
72 72
73# For Xcode 5 and up, we need to search the SDK path for headers, otherwise 73# For Xcode 5 and up, we need to search the SDK path for headers, otherwise
74# certain modules will not be built. 74# certain modules will not be built.
75.if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH:Q}/usr/include) 75.if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH:Q}/usr/include)
76CFLAGS+= -I${OSX_SDK_PATH:Q}/usr/include 76CFLAGS+= -I${OSX_SDK_PATH:Q}/usr/include
77.endif 77.endif
78 78
 79# Avoid universal build on macOS/aarch64, _decimal fails.
 80.if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64)
 81MAKE_ENV+= PYTHON_DECIMAL_WITH_MACHINE=uint128
 82.endif
 83
79PLIST_VARS+= nis 84PLIST_VARS+= nis
80.for incdir in ${_OPSYS_INCLUDE_DIRS} 85.for incdir in ${_OPSYS_INCLUDE_DIRS}
81. if (exists(${incdir}/rpc/rpc.h) || exists(${incdir}/tirpc/rpc/rpc.h)) 86. if (exists(${incdir}/rpc/rpc.h) || exists(${incdir}/tirpc/rpc/rpc.h))
82HAVE_RPC_H= yes 87HAVE_RPC_H= yes
83. endif 88. endif
84. if (exists(${incdir}/rpcsvc/yp_prot.h) || exists(${incdir}/nsl/rpcsvc/yp_prot.h)) 89. if (exists(${incdir}/rpcsvc/yp_prot.h) || exists(${incdir}/nsl/rpcsvc/yp_prot.h))
85HAVE_YP_PROT_H= yes 90HAVE_YP_PROT_H= yes
86. endif 91. endif
87.endfor 92.endfor
88.if (${HAVE_RPC_H:Uno} == yes && ${HAVE_YP_PROT_H:Uno} == yes) 93.if (${HAVE_RPC_H:Uno} == yes && ${HAVE_YP_PROT_H:Uno} == yes)
89PLIST.nis= yes 94PLIST.nis= yes
90.endif 95.endif
91 96