From nobody Thu Dec 29 16:56:51 2022 X-Original-To: dev-commits-ports-main@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 4NjZLC43lvz2kdr3; Thu, 29 Dec 2022 16:56:51 +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 4NjZLC3YPnz4MZG; Thu, 29 Dec 2022 16:56:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672333011; 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=MTknSSX9co+zvNr3rd9MsRSqQUgLOrAQsMiYjDxNa00=; b=OguPBpW2z+7YVfyrApo0qj6GiAsEtXl92GKFdSzSgVy+sIFHFJMb2Y3bwesIxJVLQJwl8Q doV5x737PuzdcRcX+Z5lZnjw9fnnB8xTvwMcb4KaluAGK0KP79162seQ8+lMMjGAouttqO xTZ3aEOmER4GKUC5SLLnlFcbAi14HlcFXRrLS8/5weDdCkaxbHaeOKueP2dxu8cQI0dZja JWSYL9euaPNkMvnDUHyAtGmxik/ZM/c2ugO8IBpQ3zrWZ/5TdI8EXMYY8WZxiT4tWJQryH xuyBwUGqBkCPdDPgR+HxN7nBvX8Bz2mV23EkT07bXP8U8XMZAHuuy8POwlIyzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672333011; 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=MTknSSX9co+zvNr3rd9MsRSqQUgLOrAQsMiYjDxNa00=; b=eucjfbt16/w52ty0RZpr7ABEZmw8jOd2uKL4OB5Is8cj6dmJQmOXIly2bU1BToZmGnGHM/ Uk48lWSBH7FjjkV1Xtbfw35i9rBx8UtfYA2WnG8K97mKe9syjjFIjm1/IvGoAhW+rUBAni 7HIhNOVMrFNGxGBo2guCny7BBM2rrS+CALQf2CN3dbelm2/oNsTprJ52QgzWCJCdcxGTxW fASyNyqOZl5KBcOTCV6b8XpdSkd/5oBjKjhCn1yRlC61gwZYKGMk+EwG6k8sl7JRL30GgW YTq+ERiPs4c8Q7PZYUQIQN22RTT9u39lZmGRJ9RHGON0nAvycn3PbrioYEDT8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672333011; a=rsa-sha256; cv=none; b=AP5l8pIS/2nvB09dvF6y+aePMik03DuIiIAgW3EV7Nv9cPL7uEIlP+AV9JKUwiglztetnk 47VBUkosr+ivTntRpca/e7z2e0hO5EMquA3AVHJi4jBgOxe/HDf6hkbYQqToGisHKWTMDw vcD9zvs5BdmNRLRuFvrlWBgTkOENALbYHi4Za7eEZsKU6O3eU2TQ3ALI6Kp+EV9g6tKBaJ 5D9Pi5QW+WgEIPtxkIGM5hZ6ZHAInS8kiEG7w5NZzAaYc6QI+q8LpdUi9br2dke3JZsdE6 WxJ2QxwpTgbGqkQkjabLuGuV+WmCr3xHJVpmI6QF8BM24uroDq4mCVtJntTyvQ== 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 4NjZLC2cVWzbYb; Thu, 29 Dec 2022 16:56:51 +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 2BTGupfB004531; Thu, 29 Dec 2022 16:56:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BTGupR4004530; Thu, 29 Dec 2022 16:56:51 GMT (envelope-from git) Date: Thu, 29 Dec 2022 16:56:51 GMT Message-Id: <202212291656.2BTGupR4004530@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: 6affa4a86bf0 - main - shells/starship: fix build on powerpc64le List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 6affa4a86bf0a277c10028c9f8b9a408f0fc8d90 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=6affa4a86bf0a277c10028c9f8b9a408f0fc8d90 commit 6affa4a86bf0a277c10028c9f8b9a408f0fc8d90 Author: Piotr Kubaj AuthorDate: 2022-12-29 16:48:07 +0000 Commit: Piotr Kubaj CommitDate: 2022-12-29 16:48:07 +0000 shells/starship: fix build on powerpc64le --- ...1.1.8_src_zlib-ng_arch_power_chunkset__power8.c | 11 +++++++ ...-1.1.8_src_zlib-ng_arch_power_power__features.c | 36 ++++++++++++++++++++ ...1.1.8_src_zlib-ng_cmake_detect-intrinsics.cmake | 38 ++++++++++++++++++++++ 3 files changed, 85 insertions(+) diff --git a/shells/starship/files/patch-cargo-crates_libz-ng-sys-1.1.8_src_zlib-ng_arch_power_chunkset__power8.c b/shells/starship/files/patch-cargo-crates_libz-ng-sys-1.1.8_src_zlib-ng_arch_power_chunkset__power8.c new file mode 100644 index 000000000000..8f8a5c324897 --- /dev/null +++ b/shells/starship/files/patch-cargo-crates_libz-ng-sys-1.1.8_src_zlib-ng_arch_power_chunkset__power8.c @@ -0,0 +1,11 @@ +--- cargo-crates/libz-ng-sys-1.1.8/src/zlib-ng/arch/power/chunkset_power8.c.orig 2022-12-29 16:08:43 UTC ++++ cargo-crates/libz-ng-sys-1.1.8/src/zlib-ng/arch/power/chunkset_power8.c +@@ -27,7 +27,7 @@ static inline void chunkmemset_4(uint8_t *from, chunk_ + } + + static inline void chunkmemset_8(uint8_t *from, chunk_t *chunk) { +- uint64_t tmp; ++ unsigned long long tmp; + zmemcpy_8(&tmp, from); + *chunk = (vector unsigned char)vec_splats(tmp); + } diff --git a/shells/starship/files/patch-cargo-crates_libz-ng-sys-1.1.8_src_zlib-ng_arch_power_power__features.c b/shells/starship/files/patch-cargo-crates_libz-ng-sys-1.1.8_src_zlib-ng_arch_power_power__features.c new file mode 100644 index 000000000000..dd01fb3e6516 --- /dev/null +++ b/shells/starship/files/patch-cargo-crates_libz-ng-sys-1.1.8_src_zlib-ng_arch_power_power__features.c @@ -0,0 +1,36 @@ +--- cargo-crates/libz-ng-sys-1.1.8/src/zlib-ng/arch/power/power_features.c.orig 1973-11-29 21:33:09 UTC ++++ cargo-crates/libz-ng-sys-1.1.8/src/zlib-ng/arch/power/power_features.c +@@ -7,6 +7,9 @@ + #ifdef HAVE_SYS_AUXV_H + # include + #endif ++#ifdef __FreeBSD__ ++#include ++#endif + #include "../../zbuild.h" + #include "power_features.h" + +@@ -17,7 +20,11 @@ Z_INTERNAL int power_cpu_has_arch_3_00 = 0; + void Z_INTERNAL power_check_features(void) { + #ifdef PPC_FEATURES + unsigned long hwcap; ++#ifdef __FreeBSD__ ++ elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap)); ++#else + hwcap = getauxval(AT_HWCAP); ++#endif + + if (hwcap & PPC_FEATURE_HAS_ALTIVEC) + power_cpu_has_altivec = 1; +@@ -25,7 +32,11 @@ void Z_INTERNAL power_check_features(void) { + + #ifdef POWER_FEATURES + unsigned long hwcap2; ++#ifdef __FreeBSD__ ++ elf_aux_info(AT_HWCAP2, &hwcap2, sizeof(hwcap2)); ++#else + hwcap2 = getauxval(AT_HWCAP2); ++#endif + + if (hwcap2 & PPC_FEATURE2_ARCH_2_07) + power_cpu_has_arch_2_07 = 1; diff --git a/shells/starship/files/patch-cargo-crates_libz-ng-sys-1.1.8_src_zlib-ng_cmake_detect-intrinsics.cmake b/shells/starship/files/patch-cargo-crates_libz-ng-sys-1.1.8_src_zlib-ng_cmake_detect-intrinsics.cmake new file mode 100644 index 000000000000..8e82c8987617 --- /dev/null +++ b/shells/starship/files/patch-cargo-crates_libz-ng-sys-1.1.8_src_zlib-ng_cmake_detect-intrinsics.cmake @@ -0,0 +1,38 @@ +--- cargo-crates/libz-ng-sys-1.1.8/src/zlib-ng/cmake/detect-intrinsics.cmake.orig 1973-11-29 21:33:09 UTC ++++ cargo-crates/libz-ng-sys-1.1.8/src/zlib-ng/cmake/detect-intrinsics.cmake +@@ -280,8 +280,17 @@ macro(check_ppc_intrinsics) + set(CMAKE_REQUIRED_FLAGS "${PPCFLAGS} ${NATIVEFLAG}") + check_c_source_compiles( + "#include ++ #ifdef __FreeBSD__ ++ #include ++ #endif + int main() { ++ #ifdef __FreeBSD__ ++ unsigned long hwcap; ++ elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap)); ++ return (hwcap & PPC_FEATURE_HAS_ALTIVEC); ++ #else + return (getauxval(AT_HWCAP) & PPC_FEATURE_HAS_ALTIVEC); ++ #endif + }" + HAVE_VMX + ) +@@ -298,8 +307,17 @@ macro(check_power8_intrinsics) + set(CMAKE_REQUIRED_FLAGS "${POWER8FLAG} ${NATIVEFLAG}") + check_c_source_compiles( + "#include ++ #ifdef __FreeBSD__ ++ #include ++ #endif + int main() { ++ #ifdef __FreeBSD__ ++ unsigned long hwcap; ++ elf_aux_info(AT_HWCAP2, &hwcap, sizeof(hwcap)); ++ return (hwcap & PPC_FEATURE2_ARCH_2_07); ++ #else + return (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07); ++ #endif + }" + HAVE_POWER8_INTRIN + )