Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 14 Jun 2023 21:12:33 GMT
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: db2d9d0db79d - main - math/py-numpy: fix build on powerpc64le
Message-ID:  <202306142112.35ELCXXv073637@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=db2d9d0db79d3fbfa674d18fa0ea69d726a2ae3e

commit db2d9d0db79d3fbfa674d18fa0ea69d726a2ae3e
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2023-06-14 21:10:48 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2023-06-14 21:12:29 +0000

    math/py-numpy: fix build on powerpc64le
    
    In file included from numpy/core/src/umath/loops_comparison.dispatch.c.src:12:
    In file included from numpy/core/src/common/simd/simd.h:63:
    In file included from numpy/core/src/common/simd/vec/vec.h:105:
    numpy/core/src/common/simd/vec/memory.h:113:1: error: call to 'vec_st' is ambiguous
    NPYV_IMPL_VEC_MEM(f64, f64)
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~
    numpy/core/src/common/simd/vec/memory.h:94:7: note: expanded from macro 'NPYV_IMPL_VEC_MEM'
        { npyv__storea((npyv_lanetype_##DW_CAST*)ptr, (npyv_##DW_CAST)vec); }               \
          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    numpy/core/src/common/simd/vec/memory.h:42:36: note: expanded from macro 'npyv__storea'
        #define npyv__storea(PTR, VEC) vec_st(VEC, 0, PTR)
                                       ^~~~~~
    /usr/lib/clang/14.0.5/include/altivec.h:11130:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector signed char __a, long __b,
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11135:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector signed char __a, long __b,
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11140:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector unsigned char __a, long __b,
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11145:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector unsigned char __a, long __b,
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11150:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector bool char __a, long __b,
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11155:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector bool char __a, long __b,
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11160:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector bool char __a, long __b,
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11165:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector short __a, long __b,
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11170:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector short __a, long __b,
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11175:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector unsigned short __a, long __b,
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11180:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector unsigned short __a, long __b,
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11185:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector bool short __a, long __b,
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11190:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector bool short __a, long __b,
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11195:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector bool short __a, long __b,
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11200:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector pixel __a, long __b,
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11205:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector pixel __a, long __b,
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11210:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector pixel __a, long __b,
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11215:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector int __a, long __b,
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11220:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector int __a, long __b, int *__c) {
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11224:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector unsigned int __a, long __b,
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11229:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector unsigned int __a, long __b,
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11234:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector bool int __a, long __b,
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11239:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector bool int __a, long __b,
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11244:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector bool int __a, long __b,
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11249:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector float __a, long __b,
                                        ^
    /usr/lib/clang/14.0.5/include/altivec.h:11254:37: note: candidate function
    static __inline__ void __ATTRS_o_ai vec_st(vector float __a, long __b,
---
 math/py-numpy/Makefile | 3 +++
 math/py-numpy/distinfo | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index 1ed4b5b8bf03..f4082a64ca27 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -12,6 +12,9 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION:R}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
+PATCH_SITES=	https://github.com/numpy/numpy/commit/
+PATCHFILES=	8692e2478cc74cc7c08e9b2a0f731a10a1ca7118.patch:-p1
+
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	The New Numeric Extension to Python
 WWW=		https://www.numpy.org/
diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo
index d0390f52b309..55e6c3eea94c 100644
--- a/math/py-numpy/distinfo
+++ b/math/py-numpy/distinfo
@@ -1,7 +1,9 @@
-TIMESTAMP = 1675667458
+TIMESTAMP = 1686775677
 SHA256 (numpy-1.24/numpy-1.24.1.tar.gz) = 2386da9a471cc00a1f47845e27d916d5ec5346ae9696e01a8a34760858fe9dd2
 SIZE (numpy-1.24/numpy-1.24.1.tar.gz) = 10903184
 SHA256 (numpy-1.24/numpy-ref.pdf) = f493c1cae879a4e0038bec400d349fc34aafa164e1462118bdf18b25a3a07daf
 SIZE (numpy-1.24/numpy-ref.pdf) = 7715485
 SHA256 (numpy-1.24/numpy-user.pdf) = 3978da15c6a1b00f2737c75458db0cc0fe636ae90b72723a8ff609d40e9b7599
 SIZE (numpy-1.24/numpy-user.pdf) = 4123384
+SHA256 (numpy-1.24/8692e2478cc74cc7c08e9b2a0f731a10a1ca7118.patch) = 59d96ad7ef708f3b63ff7c4d7daa2a12dbaf510691f84dfd7be126de39eda49e
+SIZE (numpy-1.24/8692e2478cc74cc7c08e9b2a0f731a10a1ca7118.patch) = 2861



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306142112.35ELCXXv073637>