Skip to content
Commit d86952d1 authored by Tijl Coosemans's avatar Tijl Coosemans
Browse files

editors/openoffice-4: make robust against __cxa_exception ABI changes

Patch openoffice to replace __cxa_get_globals()->caughtExceptions,
which is a pointer to the start of a struct __cxa_exception, with
__cxa_current_primary_exception(), which is a pointer to the end.  This
allows struct __cxa_exception to be extended at the start as was
recently done in FreeBSD main and stable/13 on 64-bit architectures.

Recently on FreeBSD main and stable/13 __attribute__((__aligned__)) was
added to struct _Unwind_Exception which changes its size on 32-bit
architectures, and that of __cxa_exception as well.  Patch openoffice
to detect this so packages built on 13.0 still work on 13.1.

Add a build dependency on a recent version of devel/libunwind so we
always build with an unwind.h that has the right definition of
_Unwind_Exception.

(cherry picked from commit 88045c05)
parent a53915e5
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment