From nobody Thu Jan 25 12:37:33 2024 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 4TLL254Yhnz58R5Q; Thu, 25 Jan 2024 12:37:33 +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 4TLL253zxnz4c2V; Thu, 25 Jan 2024 12:37:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706186253; 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=2WF8PWmPss1alSIGRtQDMh+Es1xfH7gLPaNgNa4fxNY=; b=HSySH9rQxwkricW4dbp87hKLJxv5xUqpP9kNu4cjCauo5iIrFugaAa0p/JczA9sbcMMQ33 bjUeibgGzSU64S9xJTgmHKp4/oeQruTG5AiRaElgBkIPkUvPq+G92ANS+WesDnSoEA0I+t nnNE9uWqrlqKYTukNmJIrNZvEuIL2NYXGmgpYBn1404YoslfjubZ+0NkF+3e5/awhUlZh9 fK/MZvBwcUTRwLM8udA8c2P+jpjiQlXSGtE0mo4GNkOPekKwpeVmFii2lNfhL6t1ScnscS 9oIxeMiSQtlGUBLYjbDD/LSpw2MnDw7W84Mjrf++2eX4xQ0bWJoNsS5oO4kwTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706186253; 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=2WF8PWmPss1alSIGRtQDMh+Es1xfH7gLPaNgNa4fxNY=; b=vxrkbz+tADVUWj0kv/HOSE81SE3KamjPlcR8EDF6cjO9U1vEDPS+nTIkrdu8N5doC1Ed/O OFavcRG0kgosreiTd3abWS5WROBMGF9PvWmKj5m0BTS80hcbKNSqvz/uMUSBq4+91sx1jV nHgTTHX2AhZqCQRx3lCk1fIGumeF0IJMFIyVS7NSwvuf4wCiwWeC2yx9KHVi9epyyXS+i8 qTuFrehruAFLOparFwRhH2y0SA1cHogr4w00MymOcr1A3L9GVLpxKWV9HHzChjr+IZeUmN tELx/CJE2ZfdNZBPr7Y/SXRhYRjPO/499BxuOTdv1+9gM24jUP/79MwaHg0qaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706186253; a=rsa-sha256; cv=none; b=H0IsBe7LeWyq2ZZAThF1s0DiVDb4TLn0c1DRNuOS8asYhXgVPAH5QcZFHJUHifxIPZ/801 HFH1cuVNocmWpwBF5o9nVVI0LOQbQyv1WyIVB7TXwFu985QEJH6fFN3MytgfHTQ7OefhHX teeMEMr/qkHJIGbQzZS10r+07aZLawvb0jyyRKPd71AcgUCnzd/w4C74NAivg7rEHb65NT FCbqgcc+U3D/I6hNAsun5+ysWKm+8gngN9UhTFAiNhLegvurxV1h9P4dPFLI7uWSwyvl/E GhbcQEweI+d4XCqIdcfDLk7CwpqiZPVSV7o6cXKOaVnn1wXgmoajtW55YE5stg== 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 4TLL2532Ctzy5l; Thu, 25 Jan 2024 12:37:33 +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 40PCbXpi006598; Thu, 25 Jan 2024 12:37:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40PCbXEV006595; Thu, 25 Jan 2024 12:37:33 GMT (envelope-from git) Date: Thu, 25 Jan 2024 12:37:33 GMT Message-Id: <202401251237.40PCbXEV006595@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ashish SHUKLA Subject: git: 05d0f788eb55 - main - text/ugrep: Import lzma aarch64 patch from archivers/lzma port 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: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05d0f788eb55620df08b9b82a610f20eca3c1b00 Auto-Submitted: auto-generated The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=05d0f788eb55620df08b9b82a610f20eca3c1b00 commit 05d0f788eb55620df08b9b82a610f20eca3c1b00 Author: Ashish SHUKLA AuthorDate: 2024-01-25 12:28:23 +0000 Commit: Ashish SHUKLA CommitDate: 2024-01-25 12:36:54 +0000 text/ugrep: Import lzma aarch64 patch from archivers/lzma port Reported by: jbeich --- textproc/ugrep/Makefile | 2 +- textproc/ugrep/files/patch-lzma_C_CpuArch.c | 41 ++++++++++++++++++++++++----- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/textproc/ugrep/Makefile b/textproc/ugrep/Makefile index 15eaa776c31c..48f8f6112550 100644 --- a/textproc/ugrep/Makefile +++ b/textproc/ugrep/Makefile @@ -1,7 +1,7 @@ PORTNAME= ugrep DISTVERSIONPREFIX= v DISTVERSION= 4.5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MAINTAINER= ashish@FreeBSD.org diff --git a/textproc/ugrep/files/patch-lzma_C_CpuArch.c b/textproc/ugrep/files/patch-lzma_C_CpuArch.c index 11cb95f5d0a8..bad85faa10c3 100644 --- a/textproc/ugrep/files/patch-lzma_C_CpuArch.c +++ b/textproc/ugrep/files/patch-lzma_C_CpuArch.c @@ -1,15 +1,42 @@ ---- lzma/C/CpuArch.c.orig 2024-01-24 11:26:34 UTC +--- lzma/C/CpuArch.c.orig 2024-01-25 12:25:30 UTC +++ lzma/C/CpuArch.c -@@ -762,10 +762,11 @@ BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYP +@@ -762,6 +762,31 @@ BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYP #include -+#ifdef __linux__ - #define USE_HWCAP ++#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 -- - #include +@@ -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 - #define MY_HWCAP_CHECK_FUNC_2(name1, name2) \