Re: git: b2127b6f1ae2 - stable/13 - Install unwind.h into /usr/include
Date: Thu, 03 Mar 2022 18:08:51 UTC
I can't even get to building libreoffice, as all the openjdk ports fail to build, with DTrace errors: dtrace: failed to compile script /wrkdirs/share/dim/ports/java/openjdk12/work/openjdk-jdk12u-jdk-12.0.2-10-4/build/bsd-x86_64-server-release/hotspot/variant-server/support/dtrace/hotspot.h.d: "/u /mbuf.d", line 1: failed to copy type of 'm_data': Type information is in parent and unavailable * For target hotspot_variant-server_gensrc_dtracefiles_hotspot_jni.h: dtrace: failed to compile script /wrkdirs/share/dim/ports/java/openjdk12/work/openjdk-jdk12u-jdk-12.0.2-10-4/build/bsd-x86_64-server-release/hotspot/variant-server/support/dtrace/hotspot_jni.h.d: race/mbuf.d", line 1: failed to copy type of 'm_data': Type information is in parent and unavailable * For target hotspot_variant-server_gensrc_dtracefiles_hs_private.h: dtrace: failed to compile script /wrkdirs/share/dim/ports/java/openjdk12/work/openjdk-jdk12u-jdk-12.0.2-10-4/build/bsd-x86_64-server-release/hotspot/variant-server/support/dtrace/hs_private.h.d: ace/mbuf.d", line 1: failed to copy type of 'm_data': Type information is in parent and unavailable It seems there is no way to disable DTrace in the openjdk ports, so I'm a little stuck on this. Maybe it is possible to build libreoffice without Java support? But then I don't know if I will get the same error as you're getting. -Dimitry > On 3 Mar 2022, at 14:45, Tomoaki AOKI <junchoon@dec.sakura.ne.jp> wrote: > > Hi. > This turned out to break editors/libreoffice build on stable/13. > Manually revert this allowed finishing build. > > It's also broken on main (not yet tested reverting this, though.) > Please look into Bug 262008 [1]. > > There can be two options. > > 1. Revert this commit (and also on main). > 2. Fix editors/libreoffice to adapt this. > > Maybe option 2 would be better, but I have no idea to do so. > If this commit have somehow not enough, addidional fix is appreciated. > > Any thoughts or fixes? > > [1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=262008 > > Regards. > > >> The branch stable/13 has been updated by dim: >> >> URL: > https://cgit.FreeBSD.org/src/commit/?id=b2127b6f1ae2b92eba1892e6f5257e3f6795fed5 >> >> commit b2127b6f1ae2b92eba1892e6f5257e3f6795fed5 >> Author: John Baldwin <jhb_at_FreeBSD.org> >> AuthorDate: 2022-02-10 17:57:49 +0000 >> Commit: Dimitry Andric <dim_at_FreeBSD.org> >> CommitDate: 2022-02-20 12:29:44 +0000 >> >> Install unwind.h into /usr/include >> >> Install headers from LLVM's libunwind in place of the headers from >> libcxxrt and allow C applications to use the library. >> >> As part of this, remove include/unwind.h and switch libthr over to >> using the installed unwind.h. >> >> Reviewed by: dim, emaste >> MFC after: 10 days >> Differential Revision: https://reviews.freebsd.org/D34065 >> >> (cherry picked from commit c00d345665366a89aaba7244d6f078dc756f4c53) >> --- >> ObsoleteFiles.inc | 5 + >> include/unwind.h | 160 ------------------------------- >> lib/libc++/Makefile | 3 - >> lib/libgcc_eh/Makefile | 4 + >> lib/libgcc_eh/Makefile.inc | 1 - >> lib/libthr/Makefile | 1 - >> tools/build/mk/OptionalObsoleteFiles.inc | 3 - >> 7 files changed, 9 insertions(+), 168 deletions(-) > > (snip) > > > -- > Tomoaki AOKI <junchoon@dec.sakura.ne.jp>