From nobody Wed Mar 9 07:30:02 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 C9DDE1A0034E; Wed, 9 Mar 2022 07:30:02 +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 4KD3kL4grjz4VXr; Wed, 9 Mar 2022 07:30:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646811002; 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=3xnL1656N4CWu0wmEb35hm54HxSHLEftLa1ClIWTa+s=; b=I67cgKy9T4OY+0Uesbwdh1KvJQSm9W4EYrLtYuc1cKZneVPB+Sc3tt0HI5RRXeIDP+p+be p+4bpCCAfqVzlxtXuwFOKytFe/kIvhxqL80vZ47isUkGndbarxUhccaYcd8AgCaapQHnGZ foyNg1xbPknZ4kNRQUPClpa5Cd0iybSbdA+5db3DG44Fvwu4dU8J96gOHmt/FvAjgblxpr c1w3Rs598vApcGnQDEeWwNKbMVJ7Stb/GFWEXamLbv7yPvFwH99Yue9gfggyaJ74bZqXEw fPIsZNIlYUAcWe0jU8+SZUDDk5gsfWWTMMZM2xY837FxLuiVIq/Rusww4osd9A== 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 7DF474830; Wed, 9 Mar 2022 07:30:02 +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 2297U25b077015; Wed, 9 Mar 2022 07:30:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2297U2X5077012; Wed, 9 Mar 2022 07:30:02 GMT (envelope-from git) Date: Wed, 9 Mar 2022 07:30:02 GMT Message-Id: <202203090730.2297U2X5077012@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: f88f34d1b4a0 - main - editors/libreoffice: work around changed alignment of __cxa_exception 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f88f34d1b4a00d94c00aae1b3097c9c637e36397 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646811002; 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=3xnL1656N4CWu0wmEb35hm54HxSHLEftLa1ClIWTa+s=; b=piwLMjcrjlV1VxXxWpXrwsO1/6dn6+mZw82qjVumme2mO0uHjhqmSTJDc5StpE1EdV7z9d wOvDYrEAVP+uxX8NeIhwfyEJWx4iCXG6KMYz4cGDAGT9H2J2Lf1XwVb0N1B9KnoE2IH5Cn Mqv9CaWMSD6nZKgFzMFdS79xTMQ1rWKkUfYsxzcgwZPGoCqcS+Qfb1kKiIxEFRYGj/5S4E eN+uHJMZM8quF35X2Jb0EqC4QUqlfQ7hJDYDNhCIVb5eyciCJn8n+xb3FYctdK+XAMLqWU GrRN9vlCJorrzbl26peDuSY/KAAixOFDCgAI+FQFgkrvv1AR0dB2ekT9go44Nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646811002; a=rsa-sha256; cv=none; b=uIC3Sfc4lmW+QbhqWmpVfKQgNuyUVLHD3/jJ3hQ1a40e+zM7/HDp3fTG7Azhn2sh9UggYB 3RJ0L2L4vsiNeWAhdt3dnEaDKg49GwAtEBoTM+yCfFV5ZrzcLWA3HWetaxT4Z5IYXOk5/M QftQyadOIypO81T8SgXClqF5WWYSZhEiMN8gzRanTULYjSMmv310EYhhyGuw/kGlMZO9Pb uKeYEG34Nhqo7FYcg0fciCRnEEMyA0oxm8S9+Q6QbZEBQRxA3nZS/4VBE4EdcaHGmBixSW g38eDEmlkSTLUbvs27upFTA5nKQxeTM4Z32/xpuM3DHfcOv1MtdooaTJYzjaSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=f88f34d1b4a00d94c00aae1b3097c9c637e36397 commit f88f34d1b4a00d94c00aae1b3097c9c637e36397 Author: Dimitry Andric AuthorDate: 2022-03-09 07:28:27 +0000 Commit: Dima Panov CommitDate: 2022-03-09 07:28:27 +0000 editors/libreoffice: work around changed alignment of __cxa_exception LibreOffice has special detection for the change in alignment and size of struct cxa_exception, when using libc++abi. However, this updated alignment also applies to libunwind and upstream libcxxrt, and will soon apply to our libcxxrt too. Enable the special detection unconditionally for x86_64 and aarch64, so libreoffice packages built on 13.0-R (with the old alignment) will seamlessly work on 13.1-R (which will have the new alignment). PR: 262008 --- editors/libreoffice/Makefile | 2 +- ...patch-bridges_source_cpp__uno_gcc3__linux__aarch64_abi.cxx | 11 +++++++++++ ...tch-bridges_source_cpp__uno_gcc3__linux__x86-64_except.cxx | 11 +++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index d78b4085a616..6128adfc52d1 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 1 +PORTREVISION= 2 .include "${.CURDIR}/Makefile.common" diff --git a/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__aarch64_abi.cxx b/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__aarch64_abi.cxx new file mode 100644 index 000000000000..dc8af45ecfea --- /dev/null +++ b/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__aarch64_abi.cxx @@ -0,0 +1,11 @@ +--- bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx.orig 2022-01-26 14:35:29 UTC ++++ bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx +@@ -147,7 +147,7 @@ extern "C" void _GLIBCXX_CDTOR_CALLABI deleteException + extern "C" void _GLIBCXX_CDTOR_CALLABI deleteException(void * exception) { + __cxxabiv1::__cxa_exception * header = + static_cast<__cxxabiv1::__cxa_exception *>(exception) - 1; +-#if !defined MACOSX && defined _LIBCPPABI_VERSION // detect libc++abi ++#if 1 + // First, the libcxxabi commit + // + // "[libcxxabi] Align unwindHeader on a double-word boundary" towards diff --git a/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_except.cxx b/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_except.cxx new file mode 100644 index 000000000000..4553e0303b2a --- /dev/null +++ b/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_except.cxx @@ -0,0 +1,11 @@ +--- bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx.orig 2022-01-26 14:35:29 UTC ++++ bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx +@@ -82,7 +82,7 @@ static void _GLIBCXX_CDTOR_CALLABI deleteException( vo + static void _GLIBCXX_CDTOR_CALLABI deleteException( void * pExc ) + { + __cxxabiv1::__cxa_exception const * header = static_cast<__cxxabiv1::__cxa_exception const *>(pExc) - 1; +-#if defined _LIBCPPABI_VERSION // detect libc++abi ++#if 1 + // First, the libcxxabi commit + // + // "[libcxxabi] Align unwindHeader on a double-word boundary" towards