diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 16:51:28 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 16:51:28 +0000 |
| commit | 940b4d1848e8c70ab7642901a68594e8016caffc (patch) | |
| tree | eb72f344ee6c3d9b80a7ecc079ea79e9fba8676d /external/libodfgen/c++11.patch | |
| parent | Initial commit. (diff) | |
| download | libreoffice-upstream/1%7.0.4.tar.xz libreoffice-upstream/1%7.0.4.zip | |
Adding upstream version 1:7.0.4.upstream/1%7.0.4upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'external/libodfgen/c++11.patch')
| -rw-r--r-- | external/libodfgen/c++11.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/external/libodfgen/c++11.patch b/external/libodfgen/c++11.patch new file mode 100644 index 000000000..f41d1a166 --- /dev/null +++ b/external/libodfgen/c++11.patch @@ -0,0 +1,44 @@ +# Add -std=c++11 before existing CXXFLAGS, in case those already contain some -std= (which will thus +# override the preceding -std=c++11, which is likely what the caller passing in those CXXFLAGS +# intends): +# +#--- configure.ac +#+++ configure.ac +#@@ -217,7 +217,7 @@ +# AS_IF([test "x$with_sharedptr" = "xc++11"], [ +# AC_MSG_CHECKING([for c++11 shared ptr]) +# save_CXXFLAGS="$CXXFLAGS" +#- CXXFLAGS="$CXXFLAGS -std=c++11" +#+ CXXFLAGS="-std=c++11 $CXXFLAGS" +# AC_COMPILE_IFELSE([ +# AC_LANG_PROGRAM( +# [[#include <memory>]], +#@@ -241,7 +241,7 @@ +# AC_MSG_RESULT([no]) +# ], [ +# AC_MSG_RESULT([yes]) +#- CXXFLAGS="$CXXFLAGS -std=c++11" +#+ CXXFLAGS="-std=c++11 $CXXFLAGS" +# ]) +# ]) +# AS_IF([test "x$with_sharedptr" = "xtr1"], [ +--- configure ++++ configure +@@ -16723,7 +16723,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++11 shared ptr" >&5 + $as_echo_n "checking for c++11 shared ptr... " >&6; } + save_CXXFLAGS="$CXXFLAGS" +- CXXFLAGS="$CXXFLAGS -std=c++11" ++ CXXFLAGS="-std=c++11 $CXXFLAGS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -16780,7 +16780,7 @@ + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- CXXFLAGS="$CXXFLAGS -std=c++11" ++ CXXFLAGS="-std=c++11 $CXXFLAGS" + + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |