[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - RepositoryExternal.mk
Michael Stahl
mstahl at redhat.com
Mon Dec 19 15:57:46 UTC 2016
RepositoryExternal.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 53b381e30ce2240a2c1159a2b2a9cd7cec1430c7
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Dec 9 17:23:11 2016 +0100
fix lpsolve dependency
It currently only requires unpacking the tarball so linking can fail
with "cannot open input file ... lpsolve55.lib"
Change-Id: I6ab99d7ecfd08b1b934f5c189d8fe74b7ee517e5
Reviewed-on: https://gerrit.libreoffice.org/31805
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
(cherry picked from commit f4732872aaba09c3d5b7cebb9af6bc7b7be534d4)
Reviewed-on: https://gerrit.libreoffice.org/32185
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9650bf9..109b924 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2377,7 +2377,7 @@ endef
else # !SYSTEM_LPSOLVE
define gb_LinkTarget__use_lpsolve
-$(call gb_LinkTarget_use_unpacked,$(1),lpsolve)
+$(call gb_LinkTarget_use_external_project,$(1),lpsolve)
ifeq ($(COM),MSC)
$(call gb_LinkTarget_add_libs,$(1),\
$(call gb_UnpackedTarball_get_dir,lpsolve)/lpsolve55/lpsolve55.lib \
More information about the Libreoffice-commits
mailing list