From nobody Thu Jan 05 23:03:29 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 4Np2814S8mz2qkPM; Thu, 5 Jan 2023 23:03:29 +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 4Np28141d2z3rwT; Thu, 5 Jan 2023 23:03:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672959809; 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=FLLT02AGqGY1m3FOvLlGU7axfqVUtVlna4YnYF3yqr4=; b=JOXLeSLdKesaLc4OghygzlZ/KP1+0SxKS6uMiJlGhlyVeYXahNL5W2IZAkLS/KXauIWHPC r/JShYodDFrkGSgHmJJHfyhqnnmZ0BlrECVZ0Uq0KjG9+QEhrdB5qcoIksuhweRw3/nySq 7Njak4Wl8VSut8X2Iy/CSxMbjnbpaGZ2jLnWjc/31rrBd0L8Yxrv6Fyb33ktG6jG1Q12/s C78pB9DzCGPwlxQ/aXR6WngszWHLca4OAZ2+V7SH6gnSAt906xqx+8Hn2PwM9Ds7K4CPkK bFlnXwEBfwZ2lhe+dAqHrRXeBfvTtmtuQcA7x0fHUmHUSA61PEvukCQDYEgKJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672959809; 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=FLLT02AGqGY1m3FOvLlGU7axfqVUtVlna4YnYF3yqr4=; b=ex8t03r/2j3uxatVd9yxGr3LEYlBlNoQ79pEMeZ0TXJQ5a3YDk+YjjCJ/URm2ErJezVkKO BpjM6qoPkv6lifWtmB647xUC//N79fH8IJ0tCKqwMM+fHmynAc8b7a6zPF7GirZTp+jWnW 9A3/uAzCDpU4FxosbCIjZWLpYD2JckZNUi8iuQbpy5Xhuec3ROFd+PSoUqHFpdTdrxjxvY cqoVNPVh7QKoRX+wl58TouUrG4XxcoFW29AzjU89K8YwH4YUnauxYN4dUab0in23uEKHbY CvkMT4Px8n13t4rJ5zUVkMyJtZ2+fqczXg6s+NowOD7cdeGCvTyAhoWW/rvUJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672959809; a=rsa-sha256; cv=none; b=krKErcIjCy2rlnDse1XVNYWyIfXHxY4Z3TICtop5OCdgPYxXhSai5y8yOw8ZNQ0mcZ5yQc wEWMSxt6nODb278nSZ7qOyrixJA88JEmgOcNDDMtvOWDB1mAsZUI35EDMdQOPP79ftPAlD OesMp7OSRbAlmHYJaCDj5WWUUaMcbfuYVoXARtkA1mZ7zhabUrjrK2nQaKhoTx3EeyPm55 szdSv7VOZR5whieA1AI8fD//CPjf8/+rHOqXv+yFJFYH/u1rC8rC3zhCx/cOF9LqPUnjgJ kTeOz7lVZtvcY0qVomiHrW5krBDxHvCsADMbvvjxQM11b5DEimJ2PDQRV7AvaQ== 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 4Np28134Qyz17bg; Thu, 5 Jan 2023 23:03:29 +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 305N3Te4078045; Thu, 5 Jan 2023 23:03:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 305N3TbP078044; Thu, 5 Jan 2023 23:03:29 GMT (envelope-from git) Date: Thu, 5 Jan 2023 23:03:29 GMT Message-Id: <202301052303.305N3TbP078044@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: 5a5e869eaeed - main - devel/qt6-base: fix build on amd64 with non-default CPUTYPE 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: 5a5e869eaeed7c3823c1cf97ddcc172470b85b9b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=5a5e869eaeed7c3823c1cf97ddcc172470b85b9b commit 5a5e869eaeed7c3823c1cf97ddcc172470b85b9b Author: Piotr Kubaj AuthorDate: 2023-01-05 23:02:00 +0000 Commit: Piotr Kubaj CommitDate: 2023-01-05 23:03:02 +0000 devel/qt6-base: fix build on amd64 with non-default CPUTYPE With bdver2: /wrkdirs/usr/ports/devel/qt6-base/work/.build/include/QtCore/6.4.2/QtCore/private/../../../../../../qtbase-everywhere-src-6.4.2/src/corelib/global/qsimd_ p.h:218:8: error: "Please enable all x86-64-v3 extensions; you probably want to use -march=haswell or -march=x86-64-v3 instead of -mavx2" --- .../files/patch-src_corelib_global_qsimd__p.h | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/devel/qt6-base/files/patch-src_corelib_global_qsimd__p.h b/devel/qt6-base/files/patch-src_corelib_global_qsimd__p.h new file mode 100644 index 000000000000..fd5106bd40b0 --- /dev/null +++ b/devel/qt6-base/files/patch-src_corelib_global_qsimd__p.h @@ -0,0 +1,34 @@ +--- src/corelib/global/qsimd_p.h.orig 2023-01-05 22:52:06 UTC ++++ src/corelib/global/qsimd_p.h +@@ -212,15 +212,6 @@ asm( + // + // macOS's fat binaries support the "x86_64h" sub-architecture and the GNU libc + // ELF loader also supports a "haswell/" subdir (e.g., /usr/lib/haswell). +-# define ARCH_HASWELL_MACROS (__AVX2__ + __BMI2__ + __FMA__ + __LZCNT__) +-# if ARCH_HASWELL_MACROS != 0 +-# if ARCH_HASWELL_MACROS != 4 +-# error "Please enable all x86-64-v3 extensions; you probably want to use -march=haswell or -march=x86-64-v3 instead of -mavx2" +-# endif +-static_assert(ARCH_HASWELL_MACROS, "Undeclared identifiers indicate which features are missing."); +-# define __haswell__ 1 +-# endif +-# undef ARCH_HASWELL_MACROS + + // x86-64 sub-architecture version 4 + // +@@ -228,15 +219,6 @@ static_assert(ARCH_HASWELL_MACROS, "Undeclared identif + // 6th generation (codename "Skylake"). AMD Zen4 is the their first processor + // with AVX512 support and it includes all of these too. + // +-# define ARCH_SKX_MACROS (__AVX512F__ + __AVX512BW__ + __AVX512CD__ + __AVX512DQ__ + __AVX512VL__) +-# if ARCH_SKX_MACROS != 0 +-# if ARCH_SKX_MACROS != 5 +-# error "Please enable all x86-64-v4 extensions; you probably want to use -march=skylake-avx512 or -march=x86-64-v4 instead of -mavx512f" +-# endif +-static_assert(ARCH_SKX_MACROS, "Undeclared identifiers indicate which features are missing."); +-# define __skylake_avx512__ 1 +-# endif +-# undef ARCH_SKX_MACROS + #endif /* Q_PROCESSOR_X86 */ + + // NEON intrinsics