From nobody Wed Sep 13 23:26:21 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 4RmGmZ18Mmz4tNPb; Wed, 13 Sep 2023 23:26:22 +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 4RmGmZ0d5hz4Tx8; Wed, 13 Sep 2023 23:26:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694647582; 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=kpyVkU75XeuDKYkPx0ekPfE5NAB2vR+TE2Cy19a7RO4=; b=v08Hu9/80jg7q6CMWX1sNsbHHQq56BbANO6gKK5wDxN0J7SV1VeykOxY9QJ8Pp/3FCubcV 3inp/scvs0a7T8sY6rzf4KWCPaFsv3s/6cTStfZffy29e8vrL8HHreR+tubzJVcBhcjrOv eSSZDodo1aAnwSLMI/hcIKv7V9/XMrUes3zYshGjoplRX6GT8KiUv4Xt1ArXg/oUjsdGdG Rfp2gi7oD5Ycyr3b4XvEUtBWSqVW2g1maGpW43htr1b923f9s6Wj7mY+UMWrSevaifGmtJ fmMMNDx0AQ9napq2Acr2wuCNGlUzi9r5PcYI6cQSpQCJhdrpbZHOiF7aLZm45A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694647582; a=rsa-sha256; cv=none; b=HH9RPkW8Yilhzqnbi93KqCHz5xhIA0oeHGsFjToVaV7NNXOgaiGcIUS7LCMNAwbOkzPLyI yK0wBZ+BCRqpT4N0wwTlTfjIUrx3wXgDiYXxelqwzfybFIDwLVlFHI91jeAxn+UwZ6Mg5p I00F/it5vgw89UOPQdD4+VT4MKhhIZ7Pzsd8GU6GEwHN9v0jic2H9vDKi23pieHCpRjn+U jQhjGcHWZae4EeKp0EnhlAme4flU89ynZce0OD0h6+a6Wlz/VLX9p+Q3iA1rVkbgn2Acsr RokTDsWaGFWP9U09Na5gi1xSY4YVHxP2jHa16K7VAVqnbhO6B3ZGlZrmKn15og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694647582; 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=kpyVkU75XeuDKYkPx0ekPfE5NAB2vR+TE2Cy19a7RO4=; b=cA63HChb6uyUrqmfsOHn7zbjuaNmkE+352MO/Xo0ZY45Z7RMGAePpH/sfiodJ0XvPC+yg8 HqrcZDRhY5tSRvUEnVBIoyNZhiga6a8HeRP32TzWp8JMgSoeTKzA32A9HrBoY9KYETuBOK aH15JWJsKVe1sCLAwb7MflYu1REK20wUGfd882fG1eRylmhNSN3lyNLWifrUdL4tIfKGyP btydJbZTxc2OMK5UZ1CPCaMVQQoxc/v/kEUp3ZSlTffiHR0BVX5L2bYrpkPVEOoYKiL3wp 1gxfrYw9lF9IG8kgOS2DG85+V3EK1Pgj9UNfFEmkAgfPu+k1IGJi9EaJ8o/Sfw== 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 4RmGmY6p9pzY8t; Wed, 13 Sep 2023 23:26:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DNQLCa028100; Wed, 13 Sep 2023 23:26:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DNQLsv028097; Wed, 13 Sep 2023 23:26:21 GMT (envelope-from git) Date: Wed, 13 Sep 2023 23:26:21 GMT Message-Id: <202309132326.38DNQLsv028097@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: db8997fb59bc - main - archivers/unarr: unbreak build on aarch64 after 29c8a5787507 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db8997fb59bc3a976c87f6c4b02974928aa43638 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=db8997fb59bc3a976c87f6c4b02974928aa43638 commit db8997fb59bc3a976c87f6c4b02974928aa43638 Author: Jan Beich AuthorDate: 2023-09-13 23:01:59 +0000 Commit: Jan Beich CommitDate: 2023-09-13 23:25:40 +0000 archivers/unarr: unbreak build on aarch64 after 29c8a5787507 lzmasdk/CpuArch.c:769:10: fatal error: 'asm/hwcap.h' file not found #include ^~~~~~~~~~~~~ Reported by: pkg-fallout --- archivers/unarr/files/patch-lzmasdk_CpuArch.c | 44 +++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/archivers/unarr/files/patch-lzmasdk_CpuArch.c b/archivers/unarr/files/patch-lzmasdk_CpuArch.c new file mode 100644 index 000000000000..e0c13d3b8d8b --- /dev/null +++ b/archivers/unarr/files/patch-lzmasdk_CpuArch.c @@ -0,0 +1,44 @@ +Copied from archivers/7-zip/files/patch-C_CpuArch.c + +--- lzmasdk/CpuArch.c.orig 2023-09-03 15:06:37 UTC ++++ lzmasdk/CpuArch.c +@@ -762,6 +762,31 @@ BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYP + + #include + ++#if defined(__FreeBSD__) ++static unsigned long get_hwcap(int aux) { ++ unsigned long hwcap; ++ if (elf_aux_info(aux, &hwcap, sizeof hwcap) != 0) { ++ return 0; ++ } ++ return hwcap; ++} ++ ++#ifdef MY_CPU_ARM64 ++BoolInt CPU_IsSupported_CRC32(void) { return get_hwcap(AT_HWCAP) & HWCAP_CRC32; } ++BoolInt CPU_IsSupported_NEON(void) { return 1; } ++BoolInt CPU_IsSupported_SHA1(void){ return get_hwcap(AT_HWCAP) & HWCAP_SHA1; } ++BoolInt CPU_IsSupported_SHA2(void) { return get_hwcap(AT_HWCAP) & HWCAP_SHA2; } ++BoolInt CPU_IsSupported_AES(void) { return get_hwcap(AT_HWCAP) & HWCAP_AES; } ++#else /* MY_CPU_ARM */ ++BoolInt CPU_IsSupported_CRC32(void) { return get_hwcap(AT_HWCAP2) & HWCAP2_CRC32; } ++BoolInt CPU_IsSupported_NEON(void) { return get_hwcap(AT_HWCAP) & HWCAP_NEON; } ++BoolInt CPU_IsSupported_SHA1(void){ return get_hwcap(AT_HWCAP2) & HWCAP2_SHA1; } ++BoolInt CPU_IsSupported_SHA2(void) { return get_hwcap(AT_HWCAP2) & HWCAP2_SHA2; } ++BoolInt CPU_IsSupported_AES(void) { return get_hwcap(AT_HWCAP2) & HWCAP2_AES; } ++#endif ++ ++#else // __FreeBSD__ ++ + #define USE_HWCAP + + #ifdef USE_HWCAP +@@ -795,6 +820,7 @@ MY_HWCAP_CHECK_FUNC (AES) + MY_HWCAP_CHECK_FUNC (SHA2) + MY_HWCAP_CHECK_FUNC (AES) + ++#endif // FreeBSD + #endif // __APPLE__ + #endif // _WIN32 +