From 007b998b23e424420b4019ff4546dcaa1d95cac9 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Wed, 8 Nov 2023 19:20:13 -0600 Subject: Issue #2376 - Split NSPR sed into BSD and GNU. Mac and the BSDs use [^[:space:]]. Use GNU sed on other platforms with \S. --- old-configure.in | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/old-configure.in b/old-configure.in index 41f0941164..711bf1db4d 100644 --- a/old-configure.in +++ b/old-configure.in @@ -5252,7 +5252,14 @@ ac_configure_args="$_SUBDIR_CONFIG_ARGS" # --with-system-nspr will have been converted into the relevant $NSPR_CFLAGS # and $NSPR_LIBS. -ac_configure_args="`echo $ac_configure_args | sed -e 's/--with-system-nspr[^[:space:]]* *//'`" +case "${OS_TARGET}" in + Darwin|DragonFly|FreeBSD|NetBSD|OpenBSD) + ac_configure_args="`echo $ac_configure_args | sed -e 's/--with-system-nspr[^[:space:]]* *//'`" + ;; + *) + ac_configure_args="`echo $ac_configure_args | ${TOOLCHAIN_PREFIX}sed -e 's/--with-system-nspr\S* *//'`" + ;; +esac if test -n "$NSPR_CFLAGS" -o -n "$NSPR_LIBS"; then ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'" -- cgit v1.2.3 From bcc531f53b94c6f05a65da0a104e2444c38ff91e Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Wed, 8 Nov 2023 23:24:46 -0600 Subject: Issue #2281 - Follow-up: Don't include headers in extern "C". In C++17 mode using GCC 13 on Linux this is causing C linkage to be applied to the throw_gcc.h functions instead of C++. --- other-licenses/atk-1.0/atk/atkobject.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/other-licenses/atk-1.0/atk/atkobject.h b/other-licenses/atk-1.0/atk/atkobject.h index 987f2cefce..de9da63134 100644 --- a/other-licenses/atk-1.0/atk/atkobject.h +++ b/other-licenses/atk-1.0/atk/atkobject.h @@ -20,14 +20,14 @@ #ifndef __ATK_OBJECT_H__ #define __ATK_OBJECT_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #include #include #include +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + /* * AtkObject represents the minimum information all accessible objects * return. This information includes accessible name, accessible -- cgit v1.2.3