Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 14 Nov 2024 06:58:31 GMT
From:      "Jason E. Hale" <jhale@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 0338ccc4d84b - 2024Q4 - www/qt5-webengine: Fix aarch64 build on CURRENT
Message-ID:  <202411140658.4AE6wVHn015223@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2024Q4 has been updated by jhale:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0338ccc4d84b4e55a2c463410d19b6b5367112e9

commit 0338ccc4d84b4e55a2c463410d19b6b5367112e9
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2024-11-14 06:49:16 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2024-11-14 06:58:19 +0000

    www/qt5-webengine: Fix aarch64 build on CURRENT
    
    ../../../../kde-qtwebengine-5.15.18p2/src/3rdparty/chromium/third_party/crc32c/src/src/crc32c_arm64.cc:87:20:
    error: always_inline function 'vmull_p64' requires target feature 'aes',
    but would be inlined into function 'ExtendArm64' that is compiled
    without support for 'aes'
    
    Reported by:    pkg-fallout
    Obtained from:  Chromium upstream (https://chromium-review.googlesource.com/c/chromium/src/+/4137218)
    MFH:            2024Q4
    
    (cherry picked from commit 41aaa32c1fd0d2c1b7e99f24de766c3b7819f816)
---
 ...rc_3rdparty_chromium_third__party_crc32c_BUILD.gn | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_crc32c_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_crc32c_BUILD.gn
index d9cc35f2d7a1..ea26f8fd1f83 100644
--- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_crc32c_BUILD.gn
+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_crc32c_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/crc32c/BUILD.gn.orig	2019-05-23 12:39:34 UTC
+--- src/3rdparty/chromium/third_party/crc32c/BUILD.gn.orig	2024-10-28 12:54:45 UTC
 +++ src/3rdparty/chromium/third_party/crc32c/BUILD.gn
-@@ -15,12 +15,9 @@ config("crc32c_config") {
+@@ -16,13 +16,10 @@ config("crc32c_config") {
    ]
  
    defines = [
@@ -8,9 +8,21 @@
 +    "BYTE_ORDER_BIG_ENDIAN=__BYTE_ORDER__==__ORDER_BIG_ENDIAN__",
      "CRC32C_TESTS_BUILT_WITH_GLOG=0",
    ]
--
+ 
 -  # If we ever support big-endian builds, add logic to conditionally enable
 -  # BYTE_ORDER_BIG_ENDIAN.
- 
+-
    if (target_cpu == "x86" || target_cpu == "x64") {
      defines += [
+       "HAVE_MM_PREFETCH=1",
+@@ -122,6 +119,10 @@ source_set("crc32c_arm64") {
+         "-target-feature",
+         "-Xclang",
+         "+crypto",
++        "-Xclang",
++        "-target-feature",
++        "-Xclang",
++        "+aes",
+       ]
+     } else {
+       cflags = [ "-march=armv8-a+crc+crypto" ]



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411140658.4AE6wVHn015223>