From nobody Mon Aug 22 11:53:36 2022 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 4MB9jr6LR1z4ZRRb; Mon, 22 Aug 2022 11:53:36 +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 4MB9jr5hswz3tXj; Mon, 22 Aug 2022 11:53:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661169216; 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=kPdgtUvJkWSyd45Hrgg1U7xcZafAQ1viv0y1oQAVM8s=; b=VhlH2CgNi4eB8YYjRTeIwTUcfUjMv8Ct8o50O87jHr0oWABIyA3mCWsDqs5Wof1QpxQYic FdvZzxussijpHAORct36L2Mk8IFL2KBHKIJGExulq0hlSf8XCG0VsYN2Q1roeDjVTksaFl CkTjL6kJrcnciRWOFChAkiWsYCIDlnOmH2i6Zmm25NR04HhTojy2mdpY6oCN98D1lUGAAc d166VXuhxD/5+W4ngVvrlii7ag3t7vbml8gDMUgIzt2PgMw767EzUNEhZxwRVbTCjuPH8L q4RjHJT4c3yMrNEmB9XfI2CeOLL8mJC6aOx+kH1oc9uldlMhal+abPIefZUBxg== 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 4MB9jr4m9Gzpc4; Mon, 22 Aug 2022 11:53:36 +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 27MBraTZ072815; Mon, 22 Aug 2022 11:53:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27MBra01072814; Mon, 22 Aug 2022 11:53:36 GMT (envelope-from git) Date: Mon, 22 Aug 2022 11:53:36 GMT Message-Id: <202208221153.27MBra01072814@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: fb49e0f87bec - main - qt6: fix build on i386 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: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb49e0f87bec9d93bc94d1ba54dde9e33b177e6c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661169216; 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=kPdgtUvJkWSyd45Hrgg1U7xcZafAQ1viv0y1oQAVM8s=; b=emnN2PVl/uz3wKQXnqIuoDEGig4TcdTAME4brqbehE7ELS2JKizT4lJ4FQY0KNu6HukALi lu0u8upgoiYj5e52FXTErFoHJvnoIwFGJyx3bJh5ZzQTyuOHPXEq1GYuHlxFXYFCUa3tBk +a6iqbJeRM9iih5h1s7vQNpX5EdkO30JHnFvtGyTU0SQbA/VYCYcGVZbCTtvBD971v4wF5 VCeqoCjz8clNpPSB84aSaCXymkXVwG3wvDyL9MqiIvoih7KbyCW01TTtNMVos/e+PqGFXm mg89vDi4030UblOY4l3+K+WlHp6ws8n1qMu30U6FjnA2aHNbgH0bvThhsNn0tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661169216; a=rsa-sha256; cv=none; b=YN9HpSm7k1TgK4rZ1lSqmJyago1m2U9G6MqcdvGJSZoJ/iNPq0HSn3szTYJbghQHrCYFYa 8zmiTi3nzEwJXrJ4wcxhYMKpm8M3lohro+eR9GPjPPLXBtdxlFN/oJN2jt3H5/9KNkuHll UlXaBA4PR3kIG4DICw5UifglcsOTH5m/eJKBgLp9//2cTUEuqNUL+r3RB31vS+s5IcLYkm Av0We51sJ5b3N54Q/OwLO6ZmfM53oxGSV+Rz+yO3mhQWKoVeCx+ByW3PX3I+UDoD+YS0R6 3LFy7g70CzzoPX3bRVhTn7ZaercMzmYDrLUIPKPhX9gObPLzaxHteQKKMU8/SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=fb49e0f87bec9d93bc94d1ba54dde9e33b177e6c commit fb49e0f87bec9d93bc94d1ba54dde9e33b177e6c Author: Tobias C. Berner AuthorDate: 2022-08-22 11:23:15 +0000 Commit: Tobias C. Berner CommitDate: 2022-08-22 11:52:45 +0000 qt6: fix build on i386 --- devel/qt6-base/files/patch-src_corelib_thread_qthread.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/devel/qt6-base/files/patch-src_corelib_thread_qthread.h b/devel/qt6-base/files/patch-src_corelib_thread_qthread.h new file mode 100644 index 000000000000..76928aa5a1ce --- /dev/null +++ b/devel/qt6-base/files/patch-src_corelib_thread_qthread.h @@ -0,0 +1,17 @@ +--- src/corelib/thread/qthread.h.orig 2022-08-20 09:18:52 UTC ++++ src/corelib/thread/qthread.h +@@ -191,12 +191,12 @@ inline Qt::HANDLE QThread::currentThreadId() noexcept + Qt::HANDLE tid; // typedef to void* + static_assert(sizeof(tid) == sizeof(void*)); + // See https://akkadia.org/drepper/tls.pdf for x86 ABI +-#if defined(Q_PROCESSOR_X86_32) && defined(Q_OS_LINUX) && defined(__GLIBC__) // x86 32-bit always uses GS ++#if defined(Q_PROCESSOR_X86_32) && ((defined(Q_OS_LINUX) && defined(__GLIBC__)) || defined(Q_OS_FREEBSD)) // x86 32-bit always uses GS + __asm__("movl %%gs:%c1, %0" : "=r" (tid) : "i" (2 * sizeof(void*)) : ); + #elif defined(Q_PROCESSOR_X86_64) && defined(Q_OS_DARWIN64) + // 64bit macOS uses GS, see https://github.com/apple/darwin-xnu/blob/master/libsyscall/os/tsd.h + __asm__("movq %%gs:0, %0" : "=r" (tid) : : ); +-#elif defined(Q_PROCESSOR_X86_64) && (defined(Q_OS_LINUX) && defined(__GLIBC__)) || defined(Q_OS_FREEBSD) ++#elif defined(Q_PROCESSOR_X86_64) && ((defined(Q_OS_LINUX) && defined(__GLIBC__)) || defined(Q_OS_FREEBSD)) + // x86_64 Linux, BSD uses FS + __asm__("movq %%fs:%c1, %0" : "=r" (tid) : "i" (2 * sizeof(void*)) : ); + #elif defined(Q_PROCESSOR_X86_64) && defined(Q_OS_WIN)