From nobody Tue Jan 4 18:45:25 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 84090193169C; Tue, 4 Jan 2022 18:45:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JT1lB1CKvz3LfK; Tue, 4 Jan 2022 18:45:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 060931E247; Tue, 4 Jan 2022 18:45:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 204IjPRV079285; Tue, 4 Jan 2022 18:45:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 204IjP6w079284; Tue, 4 Jan 2022 18:45:25 GMT (envelope-from git) Date: Tue, 4 Jan 2022 18:45:25 GMT Message-Id: <202201041845.204IjP6w079284@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 3110b518c792 - main - lang/php81: fix build on powerpc64le List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3110b518c792952d1124a64d866e3118215b75e2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641321926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ly7+0Sqc/BVhoXExU31xxwaITRqhDELfuGegwqnCfE=; b=yQ6AcE8+BFljbTSpv6YxgnUZS3mzdpQamwYz0uFCon+Z2E5hLCIyVPCGEZpjWFQqhRdLmo VPn/TpQjEB2QB+9zCDaKg0ctgu5CnmekQUZgSCZduJ5LXqtlPiPXVLLJPyqqGKRhRRxice Sr60Os/pcDRZjwyK/z+uybrkODVJ8qMSCv+dpoH5OEC8AsKXgLL6h4zy8vhbx6IM6F8WvA acmlWqXxS4OxvLn2fErpqRpfftGzvhUoydtBf3LejivyR9DvmoKanpaGyPi1HfRS7tNRVv eVFg+Kk06SC+3uJb8xsc6PVnq4m+6+aXs19GdCL0jCPCiWDv8uuH/XAB/fE3Eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641321926; a=rsa-sha256; cv=none; b=ySTL9/8wc50BaNWkCRLTHXNVSoRoBvBcOfxNDvY2Bty6E54gEtQuTc9ruwCnMoRC22KdPE s9FEd9fpD9d3t4UB5pah624Lz58WfX3HKLRGO4AtMMY2jEYNBmJ4msf33rk6o7rhztREFa WdUQZLiQGfW0HyoUDyTGY6EZh4+IMfgHIBYxShvICXzLrVvJ1owvr+6heNYSdJGkVj2aDM tMxNGKWq8b7q34Wjv5knNH80+UP762hGsQ5Kab/G9uz8D183O9hJoZM8ErgSweiMiRMGZs FiQZEMh4assUlagl6oVm8vQr/eUlzhXOv+It8KnDbfSlXbBtmsA3ZglWL6rbQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=3110b518c792952d1124a64d866e3118215b75e2 commit 3110b518c792952d1124a64d866e3118215b75e2 Author: Piotr Kubaj AuthorDate: 2022-01-04 18:42:59 +0000 Commit: Piotr Kubaj CommitDate: 2022-01-04 18:42:59 +0000 lang/php81: fix build on powerpc64le In file included from /wrkdirs/usr/ports/lang/php81/work/php-8.1.1/ext/hash/hash_xxhash.c:18: In file included from ext/hash/php_hash_xxhash.h:21: In file included from /wrkdirs/usr/ports/lang/php81/work/php-8.1.1/ext/hash/xxhash/xxhash.h:2412: /usr/lib/clang/11.0.1/include/altivec.h:55:19: error: unknown type name 'vector' static __inline__ vector bool char __ATTRS_o_ai ^ /usr/lib/clang/11.0.1/include/altivec.h:56:10: error: unknown type name 'vector' vec_perm(vector bool char __a, vector bool char __b, vector unsigned char __c); ^ /usr/lib/clang/11.0.1/include/altivec.h:56:32: error: unknown type name 'vector' vec_perm(vector bool char __a, vector bool char __b, vector unsigned char __c); ^ /usr/lib/clang/11.0.1/include/altivec.h:66:19: error: unknown type name 'vector' static __inline__ vector bool short __ATTRS_o_ai vec_perm( Patch from https://github.com/Cyan4973/xxHash/pull/672 --- lang/php81/files/patch-ext_hash_xxhash_xxhash.h | 46 +++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/lang/php81/files/patch-ext_hash_xxhash_xxhash.h b/lang/php81/files/patch-ext_hash_xxhash_xxhash.h new file mode 100644 index 000000000000..27abdbc2af76 --- /dev/null +++ b/lang/php81/files/patch-ext_hash_xxhash_xxhash.h @@ -0,0 +1,46 @@ +--- ext/hash/xxhash/xxhash.h.orig 2022-01-04 18:37:17 UTC ++++ ext/hash/xxhash/xxhash.h +@@ -2395,22 +2395,32 @@ XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(co + * inconsistent intrinsics, spotty coverage, and multiple endiannesses. + */ + #if XXH_VECTOR == XXH_VSX ++/* Annoyingly, these headers _may_ define three macros: `bool`, `vector`, ++ * and `pixel`. This is a problem for obvious reasons. ++ * ++ * These keywords are unnecessary; the spec literally says they are ++ * equivalent to `__bool`, `__vector`, and `__pixel` and may be undef'd ++ * after including the header. ++ * ++ * We use pragma push_macro/pop_macro to keep the namespace clean. */ ++# pragma push_macro("bool") ++# pragma push_macro("vector") ++# pragma push_macro("pixel") ++/* silence potential macro redefined warnings */ ++# undef bool ++# undef vector ++# undef pixel ++ + # if defined(__s390x__) + # include + # else +-/* gcc's altivec.h can have the unwanted consequence to unconditionally +- * #define bool, vector, and pixel keywords, +- * with bad consequences for programs already using these keywords for other purposes. +- * The paragraph defining these macros is skipped when __APPLE_ALTIVEC__ is defined. +- * __APPLE_ALTIVEC__ is _generally_ defined automatically by the compiler, +- * but it seems that, in some cases, it isn't. +- * Force the build macro to be defined, so that keywords are not altered. +- */ +-# if defined(__GNUC__) && !defined(__APPLE_ALTIVEC__) +-# define __APPLE_ALTIVEC__ +-# endif + # include + # endif ++ ++/* Restore the original macro values, if applicable. */ ++# pragma pop_macro("pixel") ++# pragma pop_macro("vector") ++# pragma pop_macro("bool") + + typedef __vector unsigned long long xxh_u64x2; + typedef __vector unsigned char xxh_u8x16;