external/harfbuzz/harfbuzz-rtti.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
New commits: commit 3423e9ceb0f3c9c97537a59513725b19032a6eda Author: Caolán McNamara <[email protected]> AuthorDate: Mon Jul 30 08:51:35 2018 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Jul 31 18:20:22 2018 +0200 harfbuzz-rtti.patch doesn't apply Change-Id: Ia634c008799793f3a54354a3f7fc13446f7db3c5 Reviewed-on: https://gerrit.libreoffice.org/58302 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> (cherry picked from commit d12b73008a29317e779920e02ac521fd7af70017) Reviewed-on: https://gerrit.libreoffice.org/58330 diff --git a/external/harfbuzz/harfbuzz-rtti.patch b/external/harfbuzz/harfbuzz-rtti.patch index 83fd0f40b856..5d1cfb4959ae 100644 --- a/external/harfbuzz/harfbuzz-rtti.patch +++ b/external/harfbuzz/harfbuzz-rtti.patch @@ -1,11 +1,11 @@ --- configure +++ configure -@@ -18918,7 +18918,7 @@ - LDFLAGS="$LDFLAGS -Bsymbolic-functions" - - # Make sure we don't link to libstdc++ -- CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions" -+ CXXFLAGS="$CXXFLAGS -fno-exceptions" +@@ -19012,7 +19012,7 @@ + # even in the cases where we DO link to libstdc++. + # Put -fno-rtti before $CXXFLAGS such that users can re-enable it + # by overriding CXXFLAGS. +- CXXFLAGS="-fno-rtti $CXXFLAGS -fno-exceptions -fno-threadsafe-statics" ++ CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-threadsafe-statics" # Assorted warnings CXXFLAGS="$CXXFLAGS -Wcast-align" _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
