diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-12-02 14:41:11 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-12-06 14:29:25 +0100 |
| commit | ea7a663ce1eeb0ecb8d89421e2b0f5f09507c75b (patch) | |
| tree | 72748bec4d344d484358db58f5e469b4f31b4e32 | |
| parent | 1072274697c3774049f3ad439b11f1fedff65326 (diff) | |
unnecessary include brings in boost headers that are broken under rhel-7
(cherry picked from commit 12fc5b85ddc3b90b385ad0fc2ab0144a32bf9a4b)
(cherry picked from commit 7587f8bab881303f77864dae03999048e43c642f)
Change-Id: I1ad477b9db9ba960ae2c417799e5d91b63538d57
Reviewed-on: https://gerrit.libreoffice.org/20354
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit a18fed7db4f4a5cd85b08dce516a38e874758be6)
| -rw-r--r-- | external/liborcus/UnpackedTarball_liborcus.mk | 1 | ||||
| -rw-r--r-- | external/liborcus/unusedheader.patch.0 | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index 126f250ffb48..63e542140b0a 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -30,6 +30,7 @@ liborcus_patches += visibility.patch # f60d6eecee72349993a392a9a63ddf3383d3b8c8@2>: liborcus_patches += liborcus_0.7.0-configure.gcc5.patch.0 +liborcus_patches += unusedheader.patch.0 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ $(foreach patch,$(liborcus_patches),external/liborcus/$(patch)) \ diff --git a/external/liborcus/unusedheader.patch.0 b/external/liborcus/unusedheader.patch.0 new file mode 100644 index 000000000000..4f7a77bf3f54 --- /dev/null +++ b/external/liborcus/unusedheader.patch.0 @@ -0,0 +1,11 @@ +--- ./src/parser/pstring.cpp.orig 2015-12-02 14:38:44.658744408 +0000 ++++ ./src/parser/pstring.cpp 2015-12-02 14:38:50.449658497 +0000 +@@ -13,8 +13,6 @@ + #include <iostream> + #include <vector> + +-#include <boost/thread/mutex.hpp> +- + using namespace std; + + namespace orcus { |