[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - external/liborcus

[David Ostrovsky]

 external/liborcus/ExternalProject_liborcus.mk |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 6fe2cd8bde3a3cb7a22885962ea62a4fd8a7ee9f
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Thu Feb 19 21:22:23 2015 +0100

    liborcus: Remove BOOST_ALL_NO_LIB, it's already included upstream
    
    Reviewed-on: https://gerrit.libreoffice.org/14559
    Tested-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit 38671c869d8903ba7d0bd516d53ba0ff9d152adf)
    
    This fixes the MSVC build breakage from commit
    1714d4ce2cc3b1b1d88a4b30ce0abdb7669ecad8
    
    Change-Id: I39e65a9ee3ede5217d9d6d8499297e449af798fe
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
index 85f1588..9e68331 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -47,9 +47,6 @@ liborcus_LIBS+=-lgnustl_shared -lm
 endif
 
 liborcus_CPPCLAGS=$(CPPFLAGS)
-ifeq ($(COM),MSC)
-liborcus_CPPFLAGS+=-DBOOST_ALL_NO_LIB
-endif
 ifeq ($(SYSTEM_ZLIB),)
 liborcus_CPPFLAGS+=$(ZLIB_CFLAGS)
 endif