Date: Fri, 16 Feb 2024 09:10:05 GMT From: Don Lewis <truckman@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 14be24161950 - 2024Q1 - editors/openoffice-*: Fix build Message-ID: <202402160910.41G9A5ZW036077@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q1 has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=14be24161950017f400a9e83560fbb71501e6d43 commit 14be24161950017f400a9e83560fbb71501e6d43 Author: Don Lewis <truckman@FreeBSD.org> AuthorDate: 2024-02-13 23:37:59 +0000 Commit: Don Lewis <truckman@FreeBSD.org> CommitDate: 2024-02-16 09:04:21 +0000 editors/openoffice-*: Fix build Tweak our declaration for __cxa_allocate_exception() so that it matches the one that sometimes shows up in /usr/include/c++/v1/cxxabi.h. Clang now treats the subtle differences as an error. No PORTREVISION bump for this build fix. There should not be any functional change to the generated code if it was buildable before this fix. (cherry picked from commit dde6195c8d21cfcab6d1415d56a5f09b8d924452) --- ...patch-bridges_source_cpp__uno_gcc3__freebsd__arm_share.hxx | 11 +++++++++++ ...tch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx | 11 +++++++++++ ...bridges_source_cpp__uno_gcc3__freebsd__powerpc64_share.hxx | 5 +++-- ...h-bridges_source_cpp__uno_gcc3__freebsd__powerpc_share.hxx | 11 +++++++++++ ...ch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx | 11 +++++++++++ ...patch-bridges_source_cpp__uno_gcc3__freebsd__arm_share.hxx | 11 +++++++++++ ...tch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx | 11 +++++++++++ ...bridges_source_cpp__uno_gcc3__freebsd__powerpc64_share.hxx | 3 ++- ...h-bridges_source_cpp__uno_gcc3__freebsd__powerpc_share.hxx | 11 +++++++++++ ...ch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx | 11 +++++++++++ 10 files changed, 93 insertions(+), 3 deletions(-) diff --git a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__arm_share.hxx b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__arm_share.hxx new file mode 100644 index 000000000000..fae5635bd797 --- /dev/null +++ b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__arm_share.hxx @@ -0,0 +1,11 @@ +--- bridges/source/cpp_uno/gcc3_freebsd_arm/share.hxx.orig 2020-10-06 14:16:16 UTC ++++ bridges/source/cpp_uno/gcc3_freebsd_arm/share.hxx +@@ -61,7 +61,7 @@ namespace CPPU_CURRENT_NAMESPACE + }; + + extern "C" void *__cxa_allocate_exception( +- std::size_t thrown_size ) throw(); ++ size_t thrown_size ); + extern "C" void __cxa_throw ( + void *thrown_exception, std::type_info *tinfo, + void (*dest) (void *) ) __attribute__((noreturn)); diff --git a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx new file mode 100644 index 000000000000..0bcac37f3a23 --- /dev/null +++ b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx @@ -0,0 +1,11 @@ +--- bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx.orig 2020-10-06 14:16:16 UTC ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx +@@ -62,7 +62,7 @@ extern "C" void *__cxa_allocate_exception( + #endif /* __GLIBCXX__ */ + + extern "C" void *__cxa_allocate_exception( +- std::size_t thrown_size ) throw(); ++ size_t thrown_size ); + extern "C" void __cxa_throw ( + void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); + diff --git a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_share.hxx b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_share.hxx index acba73004356..b36fd8309b2f 100644 --- a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_share.hxx +++ b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_share.hxx @@ -1,4 +1,4 @@ ---- bridges/source/cpp_uno/gcc3_freebsd_powerpc64/share.hxx.orig 2019-09-17 22:55:10 UTC +--- bridges/source/cpp_uno/gcc3_freebsd_powerpc64/share.hxx.orig 2020-10-06 14:16:16 UTC +++ bridges/source/cpp_uno/gcc3_freebsd_powerpc64/share.hxx @@ -35,6 +35,7 @@ namespace CPPU_CURRENT_NAMESPACE @@ -15,7 +15,8 @@ +#endif /* __GLIBCXX__ */ extern "C" void *__cxa_allocate_exception( - std::size_t thrown_size ) throw(); +- std::size_t thrown_size ) throw(); ++ size_t thrown_size ); extern "C" void __cxa_throw ( void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); diff --git a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc_share.hxx b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc_share.hxx new file mode 100644 index 000000000000..3266d04affd6 --- /dev/null +++ b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc_share.hxx @@ -0,0 +1,11 @@ +--- bridges/source/cpp_uno/gcc3_freebsd_powerpc/share.hxx.orig 2020-10-06 14:16:16 UTC ++++ bridges/source/cpp_uno/gcc3_freebsd_powerpc/share.hxx +@@ -65,7 +65,7 @@ extern "C" void *__cxa_allocate_exception( + }; + + extern "C" void *__cxa_allocate_exception( +- std::size_t thrown_size ) throw(); ++ size_t thrown_size ); + extern "C" void __cxa_throw ( + void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); + diff --git a/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx new file mode 100644 index 000000000000..0aec998ac85b --- /dev/null +++ b/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx @@ -0,0 +1,11 @@ +--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx.orig 2020-10-06 14:16:16 UTC ++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx +@@ -62,7 +62,7 @@ extern "C" void *__cxa_allocate_exception( + #endif /* __GLIBCXX__ */ + + extern "C" void *__cxa_allocate_exception( +- std::size_t thrown_size ) throw(); ++ size_t thrown_size ); + extern "C" void __cxa_throw ( + void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); + diff --git a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__arm_share.hxx b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__arm_share.hxx new file mode 100644 index 000000000000..3bf2f4003750 --- /dev/null +++ b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__arm_share.hxx @@ -0,0 +1,11 @@ +--- bridges/source/cpp_uno/gcc3_freebsd_arm/share.hxx.orig 2019-09-17 22:55:10 UTC ++++ bridges/source/cpp_uno/gcc3_freebsd_arm/share.hxx +@@ -61,7 +61,7 @@ namespace CPPU_CURRENT_NAMESPACE + }; + + extern "C" void *__cxa_allocate_exception( +- std::size_t thrown_size ) throw(); ++ size_t thrown_size ); + extern "C" void __cxa_throw ( + void *thrown_exception, std::type_info *tinfo, + void (*dest) (void *) ) __attribute__((noreturn)); diff --git a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx new file mode 100644 index 000000000000..7744a82a6cd4 --- /dev/null +++ b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx @@ -0,0 +1,11 @@ +--- bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx.orig 2019-09-17 22:55:10 UTC ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx +@@ -62,7 +62,7 @@ extern "C" void *__cxa_allocate_exception( + #endif /* __GLIBCXX__ */ + + extern "C" void *__cxa_allocate_exception( +- std::size_t thrown_size ) throw(); ++ size_t thrown_size ); + extern "C" void __cxa_throw ( + void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); + diff --git a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_share.hxx b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_share.hxx index acba73004356..7b230a1dbb81 100644 --- a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_share.hxx +++ b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc64_share.hxx @@ -15,7 +15,8 @@ +#endif /* __GLIBCXX__ */ extern "C" void *__cxa_allocate_exception( - std::size_t thrown_size ) throw(); +- std::size_t thrown_size ) throw(); ++ size_t thrown_size ); extern "C" void __cxa_throw ( void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); diff --git a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc_share.hxx b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc_share.hxx new file mode 100644 index 000000000000..6e2cc713c800 --- /dev/null +++ b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__powerpc_share.hxx @@ -0,0 +1,11 @@ +--- bridges/source/cpp_uno/gcc3_freebsd_powerpc/share.hxx.orig 2019-09-17 22:55:10 UTC ++++ bridges/source/cpp_uno/gcc3_freebsd_powerpc/share.hxx +@@ -65,7 +65,7 @@ extern "C" void *__cxa_allocate_exception( + }; + + extern "C" void *__cxa_allocate_exception( +- std::size_t thrown_size ) throw(); ++ size_t thrown_size ); + extern "C" void __cxa_throw ( + void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); + diff --git a/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx new file mode 100644 index 000000000000..e1ec4b7824a7 --- /dev/null +++ b/editors/openoffice-devel/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx @@ -0,0 +1,11 @@ +--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx.orig 2019-09-17 22:55:10 UTC ++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx +@@ -62,7 +62,7 @@ extern "C" void *__cxa_allocate_exception( + #endif /* __GLIBCXX__ */ + + extern "C" void *__cxa_allocate_exception( +- std::size_t thrown_size ) throw(); ++ size_t thrown_size ); + extern "C" void __cxa_throw ( + void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202402160910.41G9A5ZW036077>