From nobody Tue Nov 21 13:35: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 4SZQPH5vFrz51dl0; Tue, 21 Nov 2023 13:35: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 4SZQPH57wyz3bjN; Tue, 21 Nov 2023 13:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700573747; 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=QS0LYSjfUhnD/igc4e8iYvhXE5qsZt0mqu1IjFF+kzM=; b=DczOvVNZVU64ngpa2CuKAtGPx/tE6u7EpzcaAqqzTbyms9h/DXNbXo/W89R8lIcqpeaq8B kzhZe7IkDGDREGpvy4v9m9e/S5vLsYCZreR6dys8Ls2MCjAqoyFnDX8v9UKWoZE//+4ReY EvhcwEanZplLtT2I8zD4MS25klAss3EOR7QFTosbgbF3D6IbJ7z8H+klPxmJx9fjg3elSQ YnXekmfKbe1ariIAu1Znt7krXRB23Ik9uP6DMXbXA/fW4XbyADBVlYMIQPFakfLf00hzgM 2yzPHGO4h81U5S+5f2URr3sUQXMrWJIfpKYBbXeqWbndIcKWDqyfnCRb9iurLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700573747; 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=QS0LYSjfUhnD/igc4e8iYvhXE5qsZt0mqu1IjFF+kzM=; b=ircbgTYP4TZ3BoOZ5fzFubMr0e64Bp80O2dfzAQ7e4bRXZLN7m7ITU1Ulrs/sX8uMATGeD c7bBuor5LElNVlC+C3ldg0/CdhX7X5MIwM0Nuz+2rQ87s2/7L2VNZk6XU11yaOo/SBkljm blAgvCCEh+0toTTxVp9czBOT6m/OSOzHDl5Yl4Jgm9FbtFrdmhUawSl34w//XK57IweM2D doRocwt6JuZ4D5JpPUIcq+QQu+hsjQtKtpxNrFocmf6m/aO5ys71TAwYa8ab/IlDyewjj7 jQ2E+D6LMX9kbg46DxarwFl3lH15lNrg8Qb+BZAk3nNtH01lMbNuTaiLs+CIYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700573747; a=rsa-sha256; cv=none; b=U/zM25q3qrIbc/DJrTVqfSkUt5oEILiHKr1KC1FfN7blBhz8yN5XrkILmkbzw8lOxqUi+Z N17G4CTlkdHUmcwrIAgUY99PtGBVdkCckiEp5onFHTx7CygQPchvKGCem8biK1vfn6QxSM 824kaf7q2++h98SO1dFk89ycAmVZ6wq+WGYf8F0F7hbVzfD+i0I1vCTyVbfkBwhd3OzY89 HqT4qkQwXJvrJR3pTCTMNIv3tYWp1SYIgxpAe35++botwkID4O5c2YCmPuulI/opn8LOmV 8yNURv68p1Pe07N37pNKJMDZ6zIWdKdEq4bUkuG+IOhxps7HfRtm0GFvo8JBkw== 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 4SZQPH3w20zdJB; Tue, 21 Nov 2023 13:35: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 3ALDZl6P043488; Tue, 21 Nov 2023 13:35:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ALDZllv043486; Tue, 21 Nov 2023 13:35:47 GMT (envelope-from git) Date: Tue, 21 Nov 2023 13:35:47 GMT Message-Id: <202311211335.3ALDZllv043486@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: a03cc433ac6b - main - editors/libreoffice: fix build on powerpc64le 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a03cc433ac6bf2bd364dff821847d8572401c0e1 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=a03cc433ac6bf2bd364dff821847d8572401c0e1 commit a03cc433ac6bf2bd364dff821847d8572401c0e1 Author: Piotr Kubaj AuthorDate: 2023-11-21 13:24:56 +0000 Commit: Piotr Kubaj CommitDate: 2023-11-21 13:35:44 +0000 editors/libreoffice: fix build on powerpc64le Disable musttail: fatal error: error in backend: failed to perform tail call elimination on a call site marked musttail --- editors/libreoffice/Makefile | 1 + .../files/patch-external_skia_UnpackedTarball__skia.mk | 6 +++--- editors/libreoffice/files/powerpc64le-skia.patch.0 | 11 +++++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index ad70193897c2..1806e6ab8fc7 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -370,6 +370,7 @@ post-patch: .if ${COMPILER_FEATURES:Mlibstdc++} ${REINPLACE_CMD} -e 's/gb_CC/gb_CXX/' ${WRKSRC}/solenv/gbuild/platform/unxgcc.mk .endif + ${CP} ${FILESDIR}/powerpc64le-skia.patch.0 ${WRKSRC}/external/skia/ pre-configure: @${TOUCH} ${WRKSRC}/autogen.lastrun diff --git a/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk b/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk index aa9203f7dfd6..a85a3aa61512 100644 --- a/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk +++ b/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk @@ -1,11 +1,11 @@ ---- external/skia/UnpackedTarball_skia.mk.orig 2022-05-12 13:26:05 UTC +--- external/skia/UnpackedTarball_skia.mk.orig 2023-09-22 19:07:01 UTC +++ external/skia/UnpackedTarball_skia.mk -@@ -39,6 +39,7 @@ skia_patches := \ +@@ -39,6 +39,8 @@ skia_patches := \ tdf147342.patch.0 \ redefinition-of-op.patch.0 \ 0001-Added-missing-include-cstdio.patch \ + gfx-skia-skia-src-core-SkCpu.cpp.patch.0 \ ++ powerpc64le-skia.patch.0 \ $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1)) - diff --git a/editors/libreoffice/files/powerpc64le-skia.patch.0 b/editors/libreoffice/files/powerpc64le-skia.patch.0 new file mode 100644 index 000000000000..401a652385b9 --- /dev/null +++ b/editors/libreoffice/files/powerpc64le-skia.patch.0 @@ -0,0 +1,11 @@ +--- src/core/SkRasterPipeline.h.orig 2023-11-21 02:40:26.293131000 +0000 ++++ src/core/SkRasterPipeline.h 2023-11-21 02:40:36.868877000 +0000 +@@ -24,7 +24,7 @@ + struct SkImageInfo; + struct skcms_TransferFunction; + +-#if __has_cpp_attribute(clang::musttail) && !defined(__EMSCRIPTEN__) && !defined(SK_CPU_ARM32) ++#if __has_cpp_attribute(clang::musttail) && !defined(__EMSCRIPTEN__) && !defined(SK_CPU_ARM32) && !defined(__powerpc__) + #define SK_HAS_MUSTTAIL 1 + #else + #define SK_HAS_MUSTTAIL 0