From nobody Wed Jul 26 04:29: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 4R9gsm1j17z4ngKj; Wed, 26 Jul 2023 04:29:48 +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 4R9gsl4cHYz3QjB; Wed, 26 Jul 2023 04:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690345787; 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=JHitYXGMb4mmVbmhXbZcMWjQ+97UAav2flJd4stHxao=; b=ESa+zrnz38s3upgIw5qehLgL3+sGEXw/AgFWQGAx13lHJHeEQ4vhyNMHjvzqkmGoW24d1V zzTI1nL+Uz2Q92gUj1q8co7h/kMTLpNt33cph6sMEFch5UgbwOf0FwC3XUlPV1YgLSUcfS JFXAVd0aUFP9OIxcwCs+ORCak5L0rDjE8RIdIZa5WE/Tk6imHxaZHnAxSirErqG4dpxujk UY7mGrU173Zxy3iuO459OmjG9c6cz+AyMclv8AYx02dvkJxLSlDncUJF/8943SiTsiyTd/ ggSyU0epF/WxwKvCYdPE1l2BSCySRMCvHlAxUXnM7VLV4dywanAV71O7GgCmZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690345787; 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=JHitYXGMb4mmVbmhXbZcMWjQ+97UAav2flJd4stHxao=; b=TYcbRivY3B+QhM21wIi+fuO/vZHtY6wJ/3wZhdmiZYW3ix1QCBxpM1TCKPIgtwzoVOXJEy Y9bOJ60B+jLLHVkTWSIFN9dFVMDlPaJjm/PC8Hc66STYIfXhMe7EthHrrYTNfglhut2FRO OvcOYbTngGSFxn04SCf3D2EVOKgmjHXHT+cpAW4TXthV0pcQOkXy74w4/35q3AAOKjO/hh kFW12nxxvvIo3LjWvcBOTLzdeqxeeWgtby94vUC+jyQeyRK3/c88Xs5mfn1hVMHMGnH5R1 6si+tHE7GrtwXZG7M3Sm6FOIFbqCgeIXzOa2uZg0d9IuJVl0sLGReS407QRXXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690345787; a=rsa-sha256; cv=none; b=S/t7DfbbN7Q0kRY+ZaeLgmg2XdKazlRJ6TZUdH7x/A/M66c7V0/McTMsCq4SILSpByED1C 3gd1k6PrlbXDujIbrmlKj6a6GmyfdVmhsLjDSz+K7sIPAb+duMK9Pyqj2MtDOA+YaRmzXE D4bMQ0VKsIy6EotzBNMBKXlAUjOgW3Mio2DUl6T7K521zp394GODZ1YLdjBap4iRoyz6Ob 4ZU7fu+bBD+QdIvv5kKStpEwVux+gJboLBmhj2cXXm+/O6m8qqGG+7E1gFTSpAEnEBaL9I WnJqNxoJvCNTk5YSbUwVSyNQFAOOV6nVjO3QrgV0Xhgu6Mz7/pP6p74mGfHIcw== 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 4R9gsl3HfCzTFK; Wed, 26 Jul 2023 04:29: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 36Q4Tln4027893; Wed, 26 Jul 2023 04:29:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36Q4Tlco027892; Wed, 26 Jul 2023 04:29:47 GMT (envelope-from git) Date: Wed, 26 Jul 2023 04:29:47 GMT Message-Id: <202307260429.36Q4Tlco027892@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Lo=C3=AFc=20Bartoletti?= Subject: git: 8f8a9b9357c8 - main - graphics/qt6-3d: 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: lbartoletti X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f8a9b9357c846475b76853b3925871c3e4a04ce Auto-Submitted: auto-generated The branch main has been updated by lbartoletti: URL: https://cgit.FreeBSD.org/ports/commit/?id=8f8a9b9357c846475b76853b3925871c3e4a04ce commit 8f8a9b9357c846475b76853b3925871c3e4a04ce Author: Loïc Bartoletti AuthorDate: 2023-07-25 18:53:31 +0000 Commit: Loïc Bartoletti CommitDate: 2023-07-26 04:28:56 +0000 graphics/qt6-3d: fix build on i386 PR: 272422 Exp-run by: antoine --- graphics/qt6-3d/Makefile | 6 ++++++ graphics/qt6-3d/pkg-plist | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/graphics/qt6-3d/Makefile b/graphics/qt6-3d/Makefile index 411876792125..0dba598a8f93 100644 --- a/graphics/qt6-3d/Makefile +++ b/graphics/qt6-3d/Makefile @@ -38,4 +38,10 @@ USE_GNOME= glib20 USE_QT= base declarative shadertools USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} +# Disable pkg-plist for i386 +.if ${ARCH} == "i386" +PLIST_SUB+= I386="@comment " +.else +PLIST_SUB+= I386="" +.endif .include diff --git a/graphics/qt6-3d/pkg-plist b/graphics/qt6-3d/pkg-plist index 9877952b8a26..92cf96a4c84e 100644 --- a/graphics/qt6-3d/pkg-plist +++ b/graphics/qt6-3d/pkg-plist @@ -126,7 +126,7 @@ %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/coresettings_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/job_common_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/matrix4x4_p.h -%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/matrix4x4_sse_p.h +%%I386%%%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/matrix4x4_sse_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/nullservices_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/propertychangehandler_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qabstractaspect_p.h @@ -186,9 +186,9 @@ %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/sqt_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/task_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/vector3d_p.h -%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/vector3d_sse_p.h +%%I386%%%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/vector3d_sse_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/vector4d_p.h -%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/vector4d_sse_p.h +%%I386%%%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/vector4d_sse_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/vector_helper_p.h %%QT_INCDIR%%/Qt3DCore/QAbstractAspect %%QT_INCDIR%%/Qt3DCore/QAbstractFunctor