[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - external/coinmp

[Michael Stahl]

 external/coinmp/ExternalProject_coinmp.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8c581dd0c843e919ae4f0e91d5b114b6bb0699fe
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Sep 21 22:40:44 2016 +0200

    coinmp: no need for bzip2 library
    
    Change-Id: I1f5115defa3619f13ce00d64d5532d2b08dc2ccb
    (cherry picked from commit 3d31cf66bb0c3f628cd175b50373f746ec45645f)
    Reviewed-on: https://gerrit.libreoffice.org/29177
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/coinmp/ExternalProject_coinmp.mk b/external/coinmp/ExternalProject_coinmp.mk
index 714171b..c2090d7 100755
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -29,6 +29,7 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
 		./configure COIN_SKIP_PROJECTS="Data/Sample" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(DISABLE_DYNLOADING),--disable-shared) \
+			--disable-bzlib \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 			--enable-dependency-linking F77=unavailable \
 			$(if $(filter LINUX,$(OS)), \