From nobody Thu Mar 9 09:49:30 2023 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 4PXPXq2RMgz3wSpn; Thu, 9 Mar 2023 09:49:31 +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 4PXPXq1YLLz4YBc; Thu, 9 Mar 2023 09:49:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678355371; 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=Cy2HCSuLsn22i1czYhRMFTrb57WsI1tCWcVnZaW540c=; b=fqYtEYagUtbHFHG7C4/6QvPJw5ZHVOvtAz2+gzl9lKTJUgpE9ZBrdmY+AGBkoN5KlWxJoJ mSY9qVgjEONnv46qVnLqpHYzNM50TAE3XNuDgNH5wEfqZgyEqGs3SDVM/rwdBQdnxw2WHZ ciM27ALQiG16/PoA1KBLAWPVHNVcJjOe+g4JLfEH+iDPbfFCRZ/O6viyjOhtOUI/cq1YyS 9jddIH3PuQnwE7RPo9cEPs1QKc0gdqxIMEpL6g41h1I2LGQb9di5TajBU2tRH6KMtO3LJ8 mpYD9sBW/99ML5S4mfM0VFYGUd5/nGTUGxfNLnrXfDI2XIlTzKWmOiA+DwMtbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678355371; 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=Cy2HCSuLsn22i1czYhRMFTrb57WsI1tCWcVnZaW540c=; b=WT4zdtcZA8dX3FlPvLLSyxmH6X6hs6jxG+LgIWr2LaKzDwjWTXw/A1l8/TfvcZjz0DXWM9 yTmg/kVSSlOnsYo/22v733VawKQUQ/491W7vL8039qR/t4T6+WUCCQBBj5DvSs7nZLgYYt igy9RVRIw53Gr1bOkgQdgUM18+DSO2CAkoNLAH/dpaVg65/hiysZfuyRscUFV1yrrVnMDb GjrkkKpCiATYoW74yUshi9M/hFh6MBWPe030SaCBNQdfcH8AQcUHpQJI99+38ElKqlomOr kPTILWsghNqeIAAA2I3wL1ldbFepebeFt4w3UZTwHdPyj2rgb76cuh83tODnMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678355371; a=rsa-sha256; cv=none; b=fse7K6VbYXSnJrco29Bp8u69PydOT1daDt/3LZDvr174GKRoHdhhMddopGLNSxocdTmesz wmhutVy2L48rFqr6hWO5VrwbzWF3ZuTr/ar4NQxX/++UYGbJedx/+LXWth9NBYAA/EqsLK Fy33f2LzL3mvSQnHomnHosEApB3L09pu+XC8bQPer+EymQMqytWKLTe2uN59qrDMuYL++y Xs5lJBn9r06vCb84kXxncV4I39suV+HisM/APyf17aIOi2zzRHC2O34iaiGexlaFtnhQon B6U1gzkWkzqYCQxBv2UiT2A9uxQMlouVPe77N+XoP+yF4JcaQQfFfSibEitZWw== 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 4PXPXq0fg7z12dy; Thu, 9 Mar 2023 09:49:31 +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 3299nU5K056675; Thu, 9 Mar 2023 09:49:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3299nUgQ056674; Thu, 9 Mar 2023 09:49:30 GMT (envelope-from git) Date: Thu, 9 Mar 2023 09:49:30 GMT Message-Id: <202303090949.3299nUgQ056674@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: e00aca7abcbe - main - devel/convco: fix build on powerpc* 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: e00aca7abcbeb0aecd2f47d75a03bcde7ce3aa2a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=e00aca7abcbeb0aecd2f47d75a03bcde7ce3aa2a commit e00aca7abcbeb0aecd2f47d75a03bcde7ce3aa2a Author: Piotr Kubaj AuthorDate: 2023-03-09 09:49:06 +0000 Commit: Piotr Kubaj CommitDate: 2023-03-09 09:49:06 +0000 devel/convco: fix build on powerpc* Same patches as for shells/starfish. --- ...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/devel/convco/files/patch-cargo-crates_libz-ng-sys-1.1.8_src_zlib-ng_arch_power_chunkset__power8.c b/devel/convco/files/patch-cargo-crates_libz-ng-sys-1.1.8_src_zlib-ng_arch_power_chunkset__power8.c new file mode 100644 index 000000000000..84846c87cd7c --- /dev/null +++ b/devel/convco/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-sys-1.1.8/src/zlib-ng/arch/power/chunkset_power8.c.orig 2022-12-29 16:08:43 UTC ++++ cargo-crates/libz-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/devel/convco/files/patch-cargo-crates_libz-ng-sys-1.1.8_src_zlib-ng_arch_power_power__features.c b/devel/convco/files/patch-cargo-crates_libz-ng-sys-1.1.8_src_zlib-ng_arch_power_power__features.c new file mode 100644 index 000000000000..0fe62f5c33de --- /dev/null +++ b/devel/convco/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-sys-1.1.8/src/zlib-ng/arch/power/power_features.c.orig 1973-11-29 21:33:09 UTC ++++ cargo-crates/libz-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/devel/convco/files/patch-cargo-crates_libz-ng-sys-1.1.8_src_zlib-ng_cmake_detect-intrinsics.cmake b/devel/convco/files/patch-cargo-crates_libz-ng-sys-1.1.8_src_zlib-ng_cmake_detect-intrinsics.cmake new file mode 100644 index 000000000000..56732bab61e9 --- /dev/null +++ b/devel/convco/files/patch-cargo-crates_libz-ng-sys-1.1.8_src_zlib-ng_cmake_detect-intrinsics.cmake @@ -0,0 +1,38 @@ +--- cargo-crates/libz-sys-1.1.8/src/zlib-ng/cmake/detect-intrinsics.cmake.orig 1973-11-29 21:33:09 UTC ++++ cargo-crates/libz-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 + )