From nobody Fri Oct 14 06:30:59 2022 X-Original-To: dev-commits-ports-all@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 4Mpc376ylPz4fkG4; Fri, 14 Oct 2022 06:30:59 +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 4Mpc376M7Bz3WLD; Fri, 14 Oct 2022 06:30:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665729059; 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=1MhJ9PRYEqCMTLSwHVR9xEebMdVTG/DBRDlOmuDc0r8=; b=Jt1XObe+xmBxagzdsiUlpEsQcczvdFCC+Fm1CD18AQdPtjOV3Za1RtnXGO0A1FmFJe0ZYh BivdkUfz8ReSYa1NEUaryiApp07LI9IHapGFUYIQwaRsZeXK7dGnjTHYOU2YR5meEBY1MY ivixbCi+CZyLfZQyRFfpqL9ldWGhhzUVyHKQqB6um9DDsMOZ5MNEJnpJZs9yL4XhLM24NX M4AmSRBSSGHWUcfX+l01i9GKpka43DnO4q2yJXdo18w4A2GueM2tIHda4g90FUr2r39vvu FeIPI8ebz6cEuB1biD35pkeTHJ4W2ySVU7A/e+ekonHp08frD2S18N3BlBo/qg== 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 4Mpc375QNQzgf7; Fri, 14 Oct 2022 06:30:59 +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 29E6Ux1E026917; Fri, 14 Oct 2022 06:30:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29E6UxMx026916; Fri, 14 Oct 2022 06:30:59 GMT (envelope-from git) Date: Fri, 14 Oct 2022 06:30:59 GMT Message-Id: <202210140630.29E6UxMx026916@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: 76fa8695d9c8 - main - devel/qt6-base: fix build on armv6/armv7 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 76fa8695d9c814e0d5e9b8e28bcf6e897422b435 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665729059; 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=1MhJ9PRYEqCMTLSwHVR9xEebMdVTG/DBRDlOmuDc0r8=; b=sr57xsOu8fU/ZPBd5RbMOpVMCviGjdB2r/mq/6VAHdsubgkfYKwbdH4pYrrjEytM4EKErP vr2TTeALGYg7T7ewksERkCxJ9b6IxKcq0nj8FJL/zvya2sn754MfBBWEzaXA0+fq/6WpLK fur94prp7UU2OeBMF8SYZg+BgSr+R7Qk5dtaRHyODFCod/iaLHvoMBUW7zv+tJIN+yunIY /ZKKGsguIzBxC1hSGnz6I9T09GB4CD7+aJrGBuaxvTuQL+EMjwXY85ItU9iW6ER6pgqt/G j+5vIVCOKCEtu4aUOamCnDWo+koCLTma+HPDsioKdbiX3Bbyr6wtfr+hH1FByw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665729059; a=rsa-sha256; cv=none; b=wG+cXPxLdxSTTkDkdKGZCSSCMon4yc+02KzbRxXO/fO3kNJFucGs6pP49J+Cg8gnemOPz7 sqfSy8rrShLBp9VQ7FSSG0qoL6up6Kylv+sTh8BOJWIkNeLFmGYoIlUHsUYrIb6Q8nMOHY H8vOHszpops4ptlRv7ij40S3QiAHP2OA9D6+vyJlB7qKIXgAI/MNOazgfvGwJUxrtFiq24 yTLZE8pQaJnwIDT4XNYDRLZ9HfhWr+ERbQkcHunUy3AuTB6T5pWqLj94SLAT5Dkb8j8pHM PfLZxLaLgAcwZN9rI1SwWKj4nX02s91hoamUynMG540uWe5mfSADhgSAJxEUUA== 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=76fa8695d9c814e0d5e9b8e28bcf6e897422b435 commit 76fa8695d9c814e0d5e9b8e28bcf6e897422b435 Author: Robert Clausecker AuthorDate: 2022-10-04 22:03:00 +0000 Commit: Tobias C. Berner CommitDate: 2022-10-14 06:19:27 +0000 devel/qt6-base: fix build on armv6/armv7 The port bundles assembly code from the pixman library. On armv6/armv7, the GNU assembler is required to assemble it. Pass appropriate flags to do so. PR: 266829 --- devel/qt6-base/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile index b336b2f122ba..cbfa588d39eb 100644 --- a/devel/qt6-base/Makefile +++ b/devel/qt6-base/Makefile @@ -112,6 +112,13 @@ SQLITE_CMAKE_ON= -DFEATURE_sql_sqlite=ON \ SQLITE_CMAKE_OFF= -DFEATURE_sql_sqlite=OFF SQLITE_USES= sqlite:3 +.include + +.if ${ARCH} == "armv6" || ${ARCH} == "armv7" +BUILD_DEPENDS+= as:devel/binutils +CMAKE_ARGS+= -DCMAKE_ASM_FLAGS=-no-integrated-as +.endif + # TODO: do this cleaner -- somewhere cmake/qmake still creates empty directories # for the cmake files in INSTALL_PREFIX/lib/cmake post-install: @@ -123,4 +130,4 @@ post-install: ${RLN} $$t; \ done <${WRKDIR}/.build/user_facing_tool_links.txt -.include +.include