Makefile.top | 2
Module_tail_build.mk | 1
RepositoryExternal.mk | 11 ++-
RepositoryModule_ooo.mk | 1
config_host.mk.in | 1
configure.ac | 2
lpsolve/ExternalPackage_lpsolve.mk | 33 ++++++++++
lpsolve/ExternalProject_lpsolve.mk | 43 +++++++++++++
lpsolve/Makefile | 7 ++
lpsolve/Module_lpsolve.mk | 22 ++++++
lpsolve/UnpackedTarball_lpsolve.mk | 28 ++++++++
lpsolve/ccc.static | 11 +++
lpsolve/lp_solve_5.5-windows.patch | 5 -
lpsolve/lp_solve_5.5.patch | 50 ---------------
lpsolve/makefile.mk | 117 -------------------------------------
lpsolve/prj/d.lst | 11 ---
ooo.lst.in | 2
sccomp/Library_solver.mk | 2
sccomp/source/solver/solver.cxx | 4 +
tail_build/prj/build.lst | 2
20 files changed, 169 insertions(+), 186 deletions(-)
New commits:
commit 93e2c4a9d257ebbe794fbaba888229857e7c42d8
Author: Peter Foley <pefol...@verizon.net>
Date: Sat Nov 3 19:19:30 2012 -0400
convert lpsolve to gbuild
Change-Id: I0038b21a1b3bde4d8d3f5dd0092d15d858336680
diff --git a/Makefile.top b/Makefile.top
index acdfcb9..bcb8ab0 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -118,6 +118,7 @@ libwps\
lingucomponent\
linguistic\
lotuswordpro\
+lpsolve\
mdds\
more_fonts\
mythes\
@@ -232,7 +233,6 @@ libxml2\
libxmlsec\
libxslt\
lcms2\
-lpsolve\
migrationanalysis\
moz\
mysqlc\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index bb6cfc2..7027f34 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
lingucomponent \
linguistic \
lotuswordpro \
+ $(call gb_Helper_optional,LPSOLVE,lpsolve) \
$(call gb_Helper_optional,DESKTOP,l10ntools) \
MathMLDTD \
mdds \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a1fc086..24b66c6 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1267,8 +1267,11 @@ endif # SYSTEM_LCMS2
ifeq ($(SYSTEM_LPSOLVE),YES)
-define gb_LinkTarget__use_lpsolve55
+define gb_LinkTarget__use_lpsolve
$(call gb_LinkTarget_add_libs,$(1),-llpsolve55)
+$(call gb_LinkTarget_add_defs,$(1),\
+ -DSYSTEM_LPSOLVE \
+))
endef
@@ -1278,10 +1281,14 @@ $(eval $(call
gb_Helper_register_libraries,PLAINLIBS_OOO, \
lpsolve55 \
))
-define gb_LinkTarget__use_lpsolve55
+define gb_LinkTarget__use_lpsolve
$(call gb_LinkTarget_use_libraries,$(1),\
lpsolve55 \
)
+$(call gb_LinkTarget_set_include,$(1),\
+ -I$(call gb_UnpackedTarball_get_dir,lpsolve) \
+ $$(INCLUDE) \
+)
endef
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 752bfdc..0e63a2d 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -115,6 +115,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
lingucomponent \
linguistic \
lotuswordpro \
+ $(call gb_Helper_optional,LPSOLVE,lpsolve) \
MathMLDTD \
mdds \
Mesa \
diff --git a/config_host.mk.in b/config_host.mk.in
index 48758f1..ec66656 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -340,6 +340,7 @@ export LIBXML_LIBS=@LIBXML_LIBS@
export LIBXSLT_CFLAGS=@LIBXSLT_CFLAGS@
export LIBXSLT_LIBS=@LIBXSLT_LIBS@
export LINK_X64_BINARY=@LINK_X64_BINARY@
+export LPSOLVE_TARBALL=@LPSOLVE_TARBALL@
@x_Cygwin@ export LS=@WIN_LS@
export MANDIR=@MANDIR@
export MACOSX_DEPLOYMENT_TARGET=@MACOSX_DEPLOYMENT_TARGET@
diff --git a/configure.ac b/configure.ac
index 9517836..90948d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8955,9 +8955,11 @@ if test "$with_system_lpsolve" = "yes"; then
else
AC_MSG_RESULT([internal])
SYSTEM_LPSOLVE=NO
+ LPSOLVE_TARBALL="26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
BUILD_TYPE="$BUILD_TYPE LPSOLVE"
fi
AC_SUBST(SYSTEM_LPSOLVE)
+AC_SUBST(LPSOLVE_TARBALL)
AC_SUBST([MINGW_LPSOLVE_DLL])
dnl ===================================================================
diff --git a/lpsolve/ExternalPackage_lpsolve.mk
b/lpsolve/ExternalPackage_lpsolve.mk
new file mode 100644
index 0000000..48bbd98
--- /dev/null
+++ b/lpsolve/ExternalPackage_lpsolve.mk
@@ -0,0 +1,33 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,lpsolve,lpsolve))
+$(eval $(call gb_ExternalPackage_use_external_project,lpsolve,lpsolve))
+
+ifeq ($(GUI),WNT)
+ifeq ($(COM),GCC)
+ifneq ($(GUI_FOR_BUILD),WNT)
+$(eval $(call
gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.dll.a))
+endif # $(GUI_FOR_BUILD)
+else # $(COM)
+$(eval $(call
gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/lpsolve55.lib))
+endif # $(COM)
+$(eval $(call
gb_ExternalPackage_add_files,lpsolve,bin,lpsolve55/lpsolve55.dll))
+else # $(GUI)
+
+ifeq ($(OS),MACOSX)
+$(eval $(call
gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.dylib))
+else ifeq ($(DISABLE_DYNLOADING),TRUE)
+$(eval $(call
gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.a))
+else
+$(eval $(call
gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.so))
+endif
+
+endif # $(GUI)
+# vim: set noet sw=4 ts=4:
diff --git a/lpsolve/ExternalProject_lpsolve.mk
b/lpsolve/ExternalProject_lpsolve.mk
new file mode 100644
index 0000000..22d172c
--- /dev/null
+++ b/lpsolve/ExternalProject_lpsolve.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalProject_ExternalProject,lpsolve))
+
+$(eval $(call gb_ExternalProject_use_unpacked,lpsolve,lpsolve))
+
+$(eval $(call gb_ExternalProject_use_package,lpsolve,hunspell))
+
+$(eval $(call gb_ExternalProject_register_targets,lpsolve,\
+ build \
+))
+
+ifeq ($(GUI),WNT)
+ifeq ($(COM),GCC)
+$(call gb_ExternalProject_get_state_target,lpsolve,build):
+ cd $(EXTERNAL_WORKDIR)/lpsolve55 \
+ && $(if $(filter WNT,$(GUI_FOR_BUILD)), \
+ $(if $(filter YES,$(MINGW_SHARED_GCCLIB))
lpsolve_LDFLAGS="-shared-libgcc") \
+ $(if $(filter YES,$(MINGW_SHARED_GXXLIB))
lpsolve_LIBS="$(MINGW_SHARED_LIBSTDCPP)") \
+ cmd /c cgcc.bat, sh ccc) \
+ && touch $@
+else # $(COM)!=GCC
+$(call gb_ExternalProject_get_state_target,lpsolve,build):
+ cd $(EXTERNAL_WORKDIR)/lpsolve55 \
+ && LIB="$(ILIB)" cmd /c cvc6.bat \
+ && touch $@
+endif # $(COM)
+else # $(GUI)!=WNT
+$(call gb_ExternalProject_get_state_target,lpsolve,build):
+ cd $(EXTERNAL_WORKDIR)/lpsolve55 \
+ && sh $(if $(filter MACOSX,$(GUI)),ccc.osx, \
+ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),ccc.static, \
+ $(if $(filter AIXGCC,$(OS)$(COM)),ccc.aix.gcc,ccc))) \
+ && touch $@
+endif # $(GUI)
+# vim: set noet sw=4 ts=4:
diff --git a/lpsolve/Makefile b/lpsolve/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/lpsolve/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/lpsolve/Module_lpsolve.mk b/lpsolve/Module_lpsolve.mk
new file mode 100644
index 0000000..4200534
--- /dev/null
+++ b/lpsolve/Module_lpsolve.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Module_Module,lpsolve))
+
+ifeq ($(SYSTEM_LPSOLVE),NO)
+ifneq ($(OS),IOS)
+$(eval $(call gb_Module_add_targets,lpsolve,\
+ UnpackedTarball_lpsolve \
+ ExternalPackage_lpsolve \
+ ExternalProject_lpsolve \
+))
+endif
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/lpsolve/UnpackedTarball_lpsolve.mk
b/lpsolve/UnpackedTarball_lpsolve.mk
new file mode 100644
index 0000000..ae1def8
--- /dev/null
+++ b/lpsolve/UnpackedTarball_lpsolve.mk
@@ -0,0 +1,28 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,lpsolve))
+
+$(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))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/lpsolve/ccc.static b/lpsolve/ccc.static
new file mode 100644
index 0000000..3f9bba8
--- /dev/null
+++ b/lpsolve/ccc.static
@@ -0,0 +1,11 @@
++src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c
../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c
../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c
../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c
../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c
../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
++obj=`echo $src|sed -e 's/\.c/.o/g' -e 's!\([^ ]*/\)*!!g'`
++
++opts='-O3'
++
++def=
++
++$CC -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd
-I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP
-DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine -c $src
++ls -l
++$AR -r liblpsolve55.a $obj
++rm $obj
diff --git a/lpsolve/lp_solve_5.5-windows.patch
b/lpsolve/lp_solve_5.5-windows.patch
index 1a76c32..28f7c71 100644
--- a/lpsolve/lp_solve_5.5-windows.patch
+++ b/lpsolve/lp_solve_5.5-windows.patch
@@ -43,9 +43,10 @@
@@ -14,15 +14,4 @@
set c=cl
- rc lpsolve.rc
+-rc lpsolve.rc
++rc %SOLARINC% lpsolve.rc
-%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL
-I../colamd /LD /MD /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32
-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src%
lpsolve.res ..\lp_solve.def -o lpsolve55.dll
-+%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL
-I../colamd /LD /MD /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32
-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src%
lpsolve.res ..\lp_solve.def -Felpsolve55.dll
++%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL
-I../colamd %SOLARINC% /LD /MD /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32
-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src%
lpsolve.res ..\lp_solve.def -Felpsolve55.dll
-rem /link /LINK50COMPAT
-
-if exist a.obj del a.obj
diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch
index 8b5702b..cea6116 100644
--- a/lpsolve/lp_solve_5.5.patch
+++ b/lpsolve/lp_solve_5.5.patch
@@ -98,53 +98,3 @@
fi
rm *.o 2>/dev/null
---- misc/build/lp_solve_5.5/lpsolve55/ccc.solaris.orig Sun May 22 11:19:48 2011
-+++ misc/build/lp_solve_5.5/lpsolve55/ccc.solaris Sun May 22 11:19:48 2011
-@@ -1 +1,31 @@
--dummy
-+src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c
../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c
../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c
../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c
../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c
../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-+c=$CC
-+
-+if [ "$CPU" = "U" -o "$CPU" = "X" ]
-+then
-+ extra_cflags=-m64
-+ extra_linkflags=-m64
-+fi
-+
-+def=
-+so=
-+if [ "$PLATFORM" = "SCO_UNIX" ]
-+then def='-dy -K PIC -DNOLONGLONG'
-+ dl=-lc
-+else dl=-ldl
-+ so=y
-+fi
-+
-+opts='-xO3'
-+
-+$c $extra_cflags -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL
-I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-+ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
-+ranlib liblpsolve55.a
-+
-+if [ "$so" != "" ]
-+then
-+ $c $extra_cflags -K PIC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-+ $c $extra_linkflags -G -Bsymbolic -h liblpsolve55.so -o liblpsolve55.so
`echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` $SOLARLIB -lc -lm -ldl
-+fi
-+
-+rm *.o 2>/dev/null
---- misc/build/lp_solve_5.5/lpsolve55/ccc.static
-+++ misc/build/lp_solve_5.5/lpsolve55/ccc.static
-@@ -1,1 +1,11 @@
--dummy
-+src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c
../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c
../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c
../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c
../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c
../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-+obj=`echo $src|sed -e 's/\.c/.o/g' -e 's!\([^ ]*/\)*!!g'`
-+
-+opts='-O3'
-+
-+def=
-+
-+$CC -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd
-I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP
-DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine -c $src
-+ls -l
-+$AR -r liblpsolve55.a $obj
-+rm $obj
diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk
deleted file mode 100644
index b2f12aa..0000000
--- a/lpsolve/makefile.mk
+++ /dev/null
@@ -1,117 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=lpsolve
-TARGET=lpsolve
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(OS)" != "IOS"
-
-TARFILE_NAME=lp_solve_5.5
-TARFILE_MD5=26b3e95ddf3d9c077c480ea45874b3b8
-
-.IF "$(GUI_FOR_BUILD)"=="WNT"
-PATCH_FILES=lp_solve_5.5-windows.patch
-.ELSE
-PATCH_FILES=\
- lp_solve_5.5.patch \
- lp_solve-aix.patch \
- lp_solve-fixed-warn.patch
-ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.static
-.ENDIF
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=
-CONFIGURE_FLAGS=
-
-.IF "$(DISABLE_DYNLOADING)" == "TRUE"
-CONFIGURE_FLAGS+=--enable-static --disable-shared
-.ENDIF
-
-BUILD_DIR=lpsolve55
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
-lpsolve_LDFLAGS=-shared-libgcc
-.ENDIF
-.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-lpsolve_LIBS=$(MINGW_SHARED_LIBSTDCPP)
-.ENDIF
-.IF "$(GUI_FOR_BUILD)"=="WNT"
-BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS)
cmd /c cgcc.bat
-.ELSE
-BUILD_ACTION=sh ccc
-OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dll.a
-.ENDIF
-.ELSE
-BUILD_ACTION=cmd /c cvc6.bat
-OUT2LIB=$(BUILD_DIR)$/lpsolve55.lib
-.ENDIF
-OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll
-.ELSE
-.IF "$(OS)"=="MACOSX"
-.EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS verbose
-BUILD_ACTION=sh ccc.osx
-OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dylib
-.ELIF "$(DISABLE_DYNLOADING)" == "TRUE"
-BUILD_ACTION=sh ccc.static
-OUT2LIB=$(BUILD_DIR)$/liblpsolve55.a
-.ELSE
-.IF "$(COMNAME)"=="sunpro5"
-BUILD_ACTION=sh ccc.solaris
-.ELIF "$(OS)$(COM)"=="AIXGCC"
-BUILD_ACTION=lpsolve_LDFLAGS="$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)" sh
ccc.aix.gcc
-.ELSE
-BUILD_ACTION=sh ccc
-.ENDIF
-OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
-.ENDIF
-.ENDIF
-
-OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h
lp_SOS.h
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-
-.ENDIF
-
-.INCLUDE : target.mk
-
-.IF "$(OS)" != "IOS"
-
-.INCLUDE : tg_ext.mk
-
-.ENDIF
diff --git a/lpsolve/prj/d.lst b/lpsolve/prj/d.lst
index bf8d87c..e69de29 100644
--- a/lpsolve/prj/d.lst
+++ b/lpsolve/prj/d.lst
@@ -1,11 +0,0 @@
-mkdir: %_DEST%\inc\lpsolve
-
-..\%__SRC%\inc\lp_*.h %_DEST%\inc\lpsolve\*
-..\%__SRC%\lib\liblpsolve55.so %_DEST%\lib\liblpsolve55.so
-..\%__SRC%\lib\liblpsolve55.dylib %_DEST%\lib\liblpsolve55.dylib
-..\%__SRC%\lib\liblpsolve55.lib %_DEST%\lib\liblpsolve55.lib
-..\%__SRC%\lib\liblpsolve55.a %_DEST%\lib\liblpsolve55.a
-..\%__SRC%\lib\liblpsolve55.dll.a %_DEST%\lib\liblpsolve55.dll.a
-..\%__SRC%\lib\lpsolve55.lib %_DEST%\lib\lpsolve55.lib
-..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin\lpsolve55.dll
-
diff --git a/lpsolve/prj/dmake b/lpsolve/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/ooo.lst.in b/ooo.lst.in
index 17bc578..57bd3a3 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -4,7 +4,6 @@ c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
@@ -74,6 +73,7 @@ fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2
@JPEG_TARBALL@
@LANGUAGETOOL_TARBALL@
@LIBRSVG_TARBALL@
+@LPSOLVE_TARBALL@
@MDDS_TARBALL@
@MOZ_TARBALL@
@MSPUB_TARBALL@
diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk
index 578bd88..52f99cc 100644
--- a/sccomp/Library_solver.mk
+++ b/sccomp/Library_solver.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Library_use_libraries,solver,\
$(gb_UWINAPI) \
))
-$(eval $(call gb_Library_use_external,solver,lpsolve55))
+$(eval $(call gb_Library_use_external,solver,lpsolve))
$(eval $(call gb_Library_add_exception_objects,solver,\
sccomp/source/solver/solver \
diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx
index fa50695..8e92c9a 100644
--- a/sccomp/source/solver/solver.cxx
+++ b/sccomp/source/solver/solver.cxx
@@ -30,7 +30,11 @@
#define WINAPI __stdcall
#define LoadInverseLib FALSE
#define LoadLanguageLib FALSE
+#ifdef SYSTEM_LPSOLVE
#include <lpsolve/lp_lib.h>
+#else
+#include <lp_lib.h>
+#endif
#undef LANGUAGE_NONE
#include "solver.hxx"
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 8051c98..ba67a5e 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo
CPPUNIT:cppunit EXPAT:expat GETTEXT:gettext GLIB:glib GDK_PIXBUF:gdk-pixbuf
PANGO:pango LIBCROCO:libcroco LIBGSF:libgsf ICU:icu JPEG:jpeg LCMS2:lcms2
LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec
LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python
REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
+tb tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo
CPPUNIT:cppunit EXPAT:expat GETTEXT:gettext GLIB:glib GDK_PIXBUF:gdk-pixbuf
PANGO:pango LIBCROCO:libcroco LIBGSF:libgsf ICU:icu JPEG:jpeg LCMS2:lcms2
LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec
LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland
XPDF:xpdf ZLIB:zlib external solenv soltools NULL
tb tail_build\prj nmake - all tb_prj NULL
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
