/vcl/unx/

/allotropia/zeta-7-4'>distro/allotropia/zeta-7-4 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2012-11-03 19:19:30 -0400
committerPeter Foley <pefoley2@verizon.net>2012-11-03 19:52:07 -0400
commit93e2c4a9d257ebbe794fbaba888229857e7c42d8 (patch)
tree6edb48bc971b3ac6240f0f9ed7ebf56eb443a06d
parentbdcdbf5da0aa17f7a347ab25b5f6e0b1bea87d62 (diff)
convert lpsolve to gbuild
Change-Id: I0038b21a1b3bde4d8d3f5dd0092d15d858336680
Diffstat
-rw-r--r--Makefile.top2
-rw-r--r--Module_tail_build.mk1
-rw-r--r--RepositoryExternal.mk11
-rw-r--r--RepositoryModule_ooo.mk1
-rw-r--r--config_host.mk.in1
-rw-r--r--configure.ac2
-rw-r--r--lpsolve/ExternalPackage_lpsolve.mk33
-rw-r--r--lpsolve/ExternalProject_lpsolve.mk43
-rw-r--r--lpsolve/Makefile7
-rw-r--r--lpsolve/Module_lpsolve.mk22
-rw-r--r--lpsolve/UnpackedTarball_lpsolve.mk28
-rw-r--r--lpsolve/ccc.static11
-rw-r--r--lpsolve/lp_solve_5.5-windows.patch5
-rw-r--r--lpsolve/lp_solve_5.5.patch50
-rw-r--r--lpsolve/makefile.mk117
-rw-r--r--lpsolve/prj/d.lst11
-rw-r--r--lpsolve/prj/dmake0
-rw-r--r--ooo.lst.in2
-rw-r--r--sccomp/Library_solver.mk2
-rw-r--r--sccomp/source/solver/solver.cxx4
-rw-r--r--tail_build/prj/build.lst2
21 files changed, 169 insertions, 186 deletions
diff --git a/Makefile.top b/Makefile.top
index acdfcb90b0f6..bcb8ab081ce9 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 bb6cfc2eb897..7027f345e136 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 a1fc086a5990..24b66c6171bf 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 752bfdc35875..0e63a2d87a4e 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 48758f172966..ec6665639465 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 9517836e9b8b..90948d9807d6 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 000000000000..48bbd9837095
--- /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 000000000000..22d172cb35a4
--- /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 000000000000..ccb1c85a04da