From nobody Fri Oct 14 07:19:25 2022 X-Original-To: dev-commits-ports-branches@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 4Mpd7210dzz4fpPG; Fri, 14 Oct 2022 07:19:26 +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 4Mpd720W0Lz3YSG; Fri, 14 Oct 2022 07:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665731966; 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=/67uU1k+5n2dqkVpiAWvbMjOWUkk5nwYRbyjpsz5vLo=; b=GeN53aKsff//q9y/7fm1rOcoDzax4GToMKYJ6AfvkcOUzaBqxnppxMfTUbHuv9+/vIBEaq VBuFS9M0CkU8EdyL67zl0zvXyvbb1OV817rF3wl4kZM2xIN7fzGzvfGaRSHI9Zt7OUxdv3 csVrk+DDcvyHynSkUGis0T5L1+IG5K3GKSXfA8E3rZHAFOh1wu9+vyBkN5IEiECd1aRmlR cEQwbj5lEQ6f8yD3cgHborFJNkJA/KxHuRkgO7QBL/6Hf08pZlqLEcJKOV5proLu0/uigf LbsQlef1oCEHmaDjCaQM7KjVdYh4ZL0/9QUUKboR8vNAqJPkbVvYXQctFuJbgw== 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 4Mpd716gL2zhYx; Fri, 14 Oct 2022 07:19:25 +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 29E7JPJU079813; Fri, 14 Oct 2022 07:19:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29E7JPhc079812; Fri, 14 Oct 2022 07:19:25 GMT (envelope-from git) Date: Fri, 14 Oct 2022 07:19:25 GMT Message-Id: <202210140719.29E7JPhc079812@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Tobias C. Berner" Subject: git: f387e9fd6163 - 2022Q4 - devel/qt6-base: fix build on armv6/armv7 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q4 X-Git-Reftype: branch X-Git-Commit: f387e9fd61632bd41ebb66e6808d6b1875aacd0e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665731966; 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=/67uU1k+5n2dqkVpiAWvbMjOWUkk5nwYRbyjpsz5vLo=; b=ACq0l+CAtiN3myoqU70oFLNY80ay2X1TdJUpUfOQptDeOUDj0xiHCdnLkE2GdadjBSjr1S 0WFWrRXlLCGw7ZiYv/sdv8UpP6OZluRbuH39M21TnqFW4iMQmPrH+ORIM8NpvOyjPptre0 3spvB4zgVlexw2MZ3ujp7UqLLC8VczjBNudIvVUYM7Jip2Pi+sK4g4Ys01p0XXRbL1NvP1 +MgXh0NUcbN3qTJACqXUYAGUw6OCiLa8PHJAHQmssQCyNoO6AeCWuODbVjQ/RqI1rV4fcu 03AthWoSOygyPwwyuyWVZKZT7wGjyEvIC+7/UmwoNea63YjT1rsF126/WFcdpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665731966; a=rsa-sha256; cv=none; b=BU+VtgdWAhXYv/SEMV84jKIeUV7i4onfdfp090D2hFXdkJSQ23VXO2GJa2IwXcQMATh5U+ lkoTzlFa+FHMRA0lAp5ngdBZJkm5AQOkKcOFvbJvHrYcYGCmN5aJdiaOsJfhFdPNG9uyHM oEUgjDJcOgbM1Sm3YC+ChfI0gEMR3ij4j07UK43qhAlTo6QuuFhSr3RIXUWyd59r9Jl1Ij wRF/qWcmFPLHpbe801DgGdl/kkhU7jXdfSGLanpnaaLy4gl1UA1j9+uQy72QhyjB+cPOCJ M8Kn0HAtQlYphXV6DcjDpFywt5l+l/5H9lYB3KJj30CmvT7YXH1KfVJp6wQBMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=f387e9fd61632bd41ebb66e6808d6b1875aacd0e commit f387e9fd61632bd41ebb66e6808d6b1875aacd0e Author: Robert Clausecker AuthorDate: 2022-10-04 22:03:00 +0000 Commit: Tobias C. Berner CommitDate: 2022-10-14 07:19:10 +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 (cherry picked from commit 76fa8695d9c814e0d5e9b8e28bcf6e897422b435) --- 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