From nobody Thu Jul 27 08:33:47 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 4RBPDq5ryHz4q4HZ; Thu, 27 Jul 2023 08:33:47 +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 4RBPDq3Zf4z3Nbb; Thu, 27 Jul 2023 08:33:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690446827; 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=xIW04mw3QFF/8wVARbfsLyZcnX39uIcItsfGKfBaxqI=; b=ptKuKqx0e9HtYZQelrKriWoyupKFCA9OWut+C0e2jBQB7kAd75IgTIUwvQPgv7eUFIwWBT QpocrGHbw0EYxubMsSxYZ1ONCe/VF1UBfO3rnKcyqzVME8KF7RSPzYeLJFNMF8UtqMH0JD 2YvQnO/qBRs1KbWsdC2U+K2606h6jvpKJecFlDEoNYJcp5+pevVRffxr1nLX+RMzeRbnZH fch/gnrQW+HR+u0hFgfuM60w+2eqkJSszM6Dl7TM9L2MRXJFzcvqdjl2LTvm//mm1UHRIC bKPZjV/6LzyrQLxaS0MnILrcvAH8RU2yG7oGTnw2Ja1Nxs3nvmWOw984hm6XtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690446827; 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=xIW04mw3QFF/8wVARbfsLyZcnX39uIcItsfGKfBaxqI=; b=qqGYSJK2wxtM8oVJ7P+zUMt3ebVt5PtYSq0Ysr3t59o4pT4h6gTt9arHCvbdpdC0Y5OZk/ 1xo3uLBdgQ97FcS1rJIpPSvRygGoqfkIyzHjBGnvcQoCXBx5rsLH2tZt5vXnUg5fSeekMX gLlbIVeXGDte96U5EJSLYDNj1aiUnCRUNybMqa6YU7Hfu0wLOLPAm+kPXW1TA4FdUsJ7iz uhO584hi4Rlmz+oNcd71+rGhepSuy1SqNFlhF7JrGHc+f9Ln00yg4t0WpA1jrt8SF6H169 0y+KvaEuJoEIQklPeKar+db325EyzTerawJ5+w4YUfDTiuQQX1DC633VVNKU/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690446827; a=rsa-sha256; cv=none; b=CcQhCmPf34C2Ex1DiuEoyavTFsYkGawBdFgcA8GCiFgX9fO8vThZGNyb5hTLtSQRk0148v 6DuOuJGF7Sdj4tLZ5wjHLe0NSa0qbAS+8btgRYqb4T0cb6RHxMfao5mobOfAKyxchcF9Ra Q6GPXrq7TERpQ7ZzuLBwb8UuDkzcmu3taJ3EpTYiRmvaOH3r3zMKVE/pZ3+wozYPMxS5Yf L1jwMkYfM0h9Sk+b61Lp4Ph1D24x7yheaEVLwVIqJn5TXYzQ5x1U/BmQUG5JzntRxWWSsh LkWxEkiJ5fss2KKoGM9/N6H4TaAtP3eXqkm10zb3zjeOYu3o+pErAqM9dupNUw== 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 4RBPDq2hqwz1HJf; Thu, 27 Jul 2023 08:33:47 +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 36R8XlrS028025; Thu, 27 Jul 2023 08:33:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36R8Xlll028024; Thu, 27 Jul 2023 08:33:47 GMT (envelope-from git) Date: Thu, 27 Jul 2023 08:33:47 GMT Message-Id: <202307270833.36R8Xlll028024@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 036d56435f8a - main - x11-toolkits/qt6-declarative: Fix build on arm 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: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 036d56435f8ae5209e4bd4bcf5d8c5f9bcca6307 Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=036d56435f8ae5209e4bd4bcf5d8c5f9bcca6307 commit 036d56435f8ae5209e4bd4bcf5d8c5f9bcca6307 Author: Mikael Urankar AuthorDate: 2023-07-26 17:32:15 +0000 Commit: Mikael Urankar CommitDate: 2023-07-27 08:33:38 +0000 x11-toolkits/qt6-declarative: Fix build on arm Add the missing bits to build on arm. Reported by: fluffy Tested by: fluffy,mikael Approved by: tcberner --- .../patch-src_3rdparty_masm_assembler_ARM64Assembler.h | 11 +++++++++++ .../patch-src_3rdparty_masm_assembler_ARMv7Assembler.h | 11 +++++++++++ .../files/patch-src_3rdparty_masm_wtf_Platform.h | 17 +++++++++++++++++ .../qt6-declarative/files/patch-src_qml_configure.cmake | 11 +++++++++++ 4 files changed, 50 insertions(+) diff --git a/x11-toolkits/qt6-declarative/files/patch-src_3rdparty_masm_assembler_ARM64Assembler.h b/x11-toolkits/qt6-declarative/files/patch-src_3rdparty_masm_assembler_ARM64Assembler.h new file mode 100644 index 000000000000..78aedc0e0026 --- /dev/null +++ b/x11-toolkits/qt6-declarative/files/patch-src_3rdparty_masm_assembler_ARM64Assembler.h @@ -0,0 +1,11 @@ +--- src/3rdparty/masm/assembler/ARM64Assembler.h.orig 2018-06-15 11:30:15 UTC ++++ src/3rdparty/masm/assembler/ARM64Assembler.h +@@ -3036,6 +3036,8 @@ class ARM64Assembler { (public) + linuxPageFlush(current, current + page); + + linuxPageFlush(current, end); ++#elif OS(FREEBSD) ++ __clear_cache(code, reinterpret_cast(code) + size); + #elif OS(QNX) + #if !ENABLE(ASSEMBLER_WX_EXCLUSIVE) + msync(code, size, MS_INVALIDATE_ICACHE); diff --git a/x11-toolkits/qt6-declarative/files/patch-src_3rdparty_masm_assembler_ARMv7Assembler.h b/x11-toolkits/qt6-declarative/files/patch-src_3rdparty_masm_assembler_ARMv7Assembler.h new file mode 100644 index 000000000000..29c5396f24f0 --- /dev/null +++ b/x11-toolkits/qt6-declarative/files/patch-src_3rdparty_masm_assembler_ARMv7Assembler.h @@ -0,0 +1,11 @@ +--- src/3rdparty/masm/assembler/ARMv7Assembler.h.orig 2018-06-15 11:30:15 UTC ++++ src/3rdparty/masm/assembler/ARMv7Assembler.h +@@ -2372,6 +2372,8 @@ class ARMv7Assembler { (public) + UNUSED_PARAM(code); + UNUSED_PARAM(size); + #endif ++#elif OS(FREEBSD) && COMPILER(CLANG) ++ __clear_cache(code, reinterpret_cast(code) + size); + #else + #error "The cacheFlush support is missing on this platform." + #endif diff --git a/x11-toolkits/qt6-declarative/files/patch-src_3rdparty_masm_wtf_Platform.h b/x11-toolkits/qt6-declarative/files/patch-src_3rdparty_masm_wtf_Platform.h new file mode 100644 index 000000000000..d27be5097978 --- /dev/null +++ b/x11-toolkits/qt6-declarative/files/patch-src_3rdparty_masm_wtf_Platform.h @@ -0,0 +1,17 @@ +Due to a misspelling in GCC [1] (probably) the check for the ARMv6KZ platform +used __ARM_ARCH_6ZK__ instead of __ARM_ARCH_6KZ__. + +Append the correct spellings to the checks for __ARM_ARCH_6ZK__. + +[1] https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html + +--- src/3rdparty/masm/wtf/Platform.h.orig 2018-06-15 11:30:15 UTC ++++ src/3rdparty/masm/wtf/Platform.h +@@ -221,6 +221,7 @@ + #elif defined(__ARM_ARCH_6__) \ + || defined(__ARM_ARCH_6J__) \ + || defined(__ARM_ARCH_6K__) \ ++ || defined(__ARM_ARCH_6KZ__) \ + || defined(__ARM_ARCH_6Z__) \ + || defined(__ARM_ARCH_6ZK__) \ + || defined(__ARM_ARCH_6T2__) \ diff --git a/x11-toolkits/qt6-declarative/files/patch-src_qml_configure.cmake b/x11-toolkits/qt6-declarative/files/patch-src_qml_configure.cmake new file mode 100644 index 000000000000..c2f2bd6291a7 --- /dev/null +++ b/x11-toolkits/qt6-declarative/files/patch-src_qml_configure.cmake @@ -0,0 +1,11 @@ +--- src/qml/configure.cmake.orig 2023-07-26 19:30:31 UTC ++++ src/qml/configure.cmake +@@ -117,7 +117,7 @@ qt_feature("qml-jit" PRIVATE + LABEL "QML just-in-time compiler" + PURPOSE "Provides a JIT for QML and JavaScript" + AUTODETECT NOT IOS AND NOT TVOS +- CONDITION ( ( ( TEST_architecture_arch STREQUAL i386 ) AND TEST_pointer_32bit AND QT_FEATURE_sse2 ) OR ( ( TEST_architecture_arch STREQUAL x86_64 ) AND TEST_pointer_64bit AND QT_FEATURE_sse2 ) OR ( ( TEST_architecture_arch STREQUAL arm ) AND TEST_pointer_32bit AND TEST_arm_fp AND TEST_arm_thumb AND ( ANDROID OR LINUX OR IOS OR TVOS OR QNX ) ) OR ( ( TEST_architecture_arch STREQUAL arm64 ) AND TEST_pointer_64bit AND TEST_arm_fp AND ( ANDROID OR LINUX OR IOS OR TVOS OR QNX OR INTEGRITY ) ) ) ++ CONDITION ( ( ( TEST_architecture_arch STREQUAL i386 ) AND TEST_pointer_32bit AND QT_FEATURE_sse2 ) OR ( ( TEST_architecture_arch STREQUAL x86_64 ) AND TEST_pointer_64bit AND QT_FEATURE_sse2 ) OR ( ( TEST_architecture_arch STREQUAL arm ) AND TEST_pointer_32bit AND TEST_arm_fp AND TEST_arm_thumb AND ( FREEBSD OR ANDROID OR LINUX OR IOS OR TVOS OR QNX ) ) OR ( ( TEST_architecture_arch STREQUAL arm64 ) AND TEST_pointer_64bit AND TEST_arm_fp AND ( FREEBSD OR ANDROID OR LINUX OR IOS OR TVOS OR QNX OR INTEGRITY ) ) ) + ) + # special case begin + # When doing macOS universal builds, JIT needs to be disabled for the ARM slice.