[Libreoffice-commits] .: 2 commits - lpsolve/ExternalProject_lpsolve.mk lpsolve/UnpackedTarball_lpsolve.mk

[Libreoffice Gerrit user]

 lpsolve/ExternalProject_lpsolve.mk |    2 +-
 lpsolve/UnpackedTarball_lpsolve.mk |   10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit a7d34af344900233ba08aee2a56a3daf85ab2421
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Nov 4 08:05:10 2012 -0600

    lpsolve: missing owner for add_file
    
    Change-Id: I6cf49b204ca8fd00ba5475cb3effbe72546e3a6f

diff --git a/lpsolve/UnpackedTarball_lpsolve.mk b/lpsolve/UnpackedTarball_lpsolve.mk
index ae1def8..fc376b3 100644
--- a/lpsolve/UnpackedTarball_lpsolve.mk
+++ b/lpsolve/UnpackedTarball_lpsolve.mk
@@ -14,15 +14,23 @@ $(eval $(call gb_UnpackedTarball_set_tarball,lpsolve,$(LPSOLVE_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,lpsolve,3))
 
 ifeq ($(GUI_FOR_BUILD),WNT)
+
 $(eval $(call gb_UnpackedTarball_add_patches,lpsolve,\
 	lpsolve/lp_solve_5.5-windows.patch \
 ))
+
 else
+
 $(eval $(call gb_UnpackedTarball_add_patches,lpsolve,\
 	lpsolve/lp_solve-aix.patch \
 	lpsolve/lp_solve-fixed-warn.patch \
 	lpsolve/lp_solve_5.5.patch \
 ))
-$(eval $(call gb_UnpackedTarball_add_file,lpsolve/lpsolve55/ccc.static,lpsolve/ccc.static))
+
+$(eval $(call gb_UnpackedTarball_add_file,lpsolve,\
+	lpsolve/lpsolve55/ccc.static,lpsolve/ccc.static))
+
 endif
 # vim: set noet sw=4 ts=4:
+
+
commit befae0ceb80deb4623f3e41ff88b6dcb63eca0ad
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Nov 4 08:04:27 2012 -0600

    lpsolve: fix botched test to detect MACOSX
    
    Change-Id: I186a6191959b0b0826f3578c8d5eced12c258f3d

diff --git a/lpsolve/ExternalProject_lpsolve.mk b/lpsolve/ExternalProject_lpsolve.mk
index 22d172c..97f3428 100644
--- a/lpsolve/ExternalProject_lpsolve.mk
+++ b/lpsolve/ExternalProject_lpsolve.mk
@@ -35,7 +35,7 @@ endif # $(COM)
 else # $(GUI)!=WNT
 $(call gb_ExternalProject_get_state_target,lpsolve,build):
 	cd $(EXTERNAL_WORKDIR)/lpsolve55 \
-	&& sh $(if $(filter MACOSX,$(GUI)),ccc.osx, \
+	&& sh $(if $(filter MACOSX,$(OS)),ccc.osx, \
 	$(if $(filter TRUE,$(DISABLE_DYNLOADING)),ccc.static, \
 	$(if $(filter AIXGCC,$(OS)$(COM)),ccc.aix.gcc,ccc))) \
 	&& touch $@