diff options
| author | David Tardon <dtardon@redhat.com> | 2021-01-17 16:27:55 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-11-17 17:48:10 +0100 |
| commit | aa32100e2697dd9c5a2092cfa2a49762c6d1a708 (patch) | |
| tree | 3d8ff0ba028902d0a58695a91c4818df81152ddc /external/libodfgen/c++11.patch | |
| parent | 2f448a16fcd64a7734ab17e6e4472305b7b96551 (diff) | |
upload libodfgen 0.1.8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109840
Tested-by: Jenkins
Reviewed-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit f341a9da2eb63ea40ccc5a17d7c9dc557682469f)
Change-Id: Ibc59469b74d54a2b307ea708ea5c4a752532f0b0
Diffstat (limited to 'external/libodfgen/c++11.patch')
| -rw-r--r-- | external/libodfgen/c++11.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/external/libodfgen/c++11.patch b/external/libodfgen/c++11.patch deleted file mode 100644 index f41d1a166964..000000000000 --- a/external/libodfgen/c++11.patch +++ /dev/null @@ -1,44 +0,0 @@ -# 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 |