The Lpsolve solver and the CoinMP solver are both used for the same thing: a linear model, with optional integer variables by branch and bound. CoinMP (CLP plus CBC) is the more capable and better maintained of the two, so the lp_solve one adds a second bundled dependency and a parallel copy of the solver code for no capability the other lacks. Remove the LpsolveSolver component, the bundled lp_solve external (and its colamd dependency, which only lp_solve used), and all the build, configure, packaging and license references to them. A document may still name com.sun.star.comp.Calc.LpsolveSolver as its engine. SolverSettings now reads that name as the CoinMP solver, which solves the same model, so such documents keep working. The Calc solver test that exercised the engine now uses CoinMP. Its knapsack model has a single optimal total value of 6987, which fills the weight capacity of 1000 exactly and which CoinMP finds. The lp_solve run had returned a suboptimal 6981, so the test now expects the true optimum. The build setup changes only take effect after re-running autogen. Signed-off-by: Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> Change-Id: Ia14d8c491779873da6b0157aa524056275adf8f5 Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/3810 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins CPCI <releng@collaboraoffice.com> (cherry picked from commit e77738a7ca7d44fd9d1f852e26d46e3a6d60467b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/208038 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
258 lines
11 KiB
Makefile
258 lines
11 KiB
Makefile
# -*- 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/.
|
|
#
|
|
|
|
fetch_LOGFILE := $(TARFILE_LOCATION)/fetch.log
|
|
|
|
ifneq (,$(WGET))
|
|
define fetch_Download__wget_command
|
|
&& bash -c '$(WGET) --progress=dot:mega -Q 0 -P "." -l 0 -nd -nH -N --no-use-server-timestamps $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ]'
|
|
endef
|
|
|
|
else
|
|
define fetch_Download__wget_command
|
|
&& echo fetching $2 && bash -c '$(CURL) -f -L -O $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ]'
|
|
endef
|
|
|
|
endif
|
|
|
|
ifneq (,$(SHA256SUM))
|
|
define fetch_Download__checksum_command
|
|
&& SUM=`$(SHA256SUM) $1 | sed "s/ .*//"` \
|
|
&& if test "$$SUM" != "$2"; then \
|
|
echo ERROR: expected checksum for $1 is $2 2>&1 | tee -a $(fetch_LOGFILE); \
|
|
false; \
|
|
fi
|
|
endef
|
|
|
|
else
|
|
fetch_Download__checksum_command :=
|
|
|
|
endif
|
|
|
|
# fetch__Download_item url tarball-name sha256sum
|
|
define fetch__Download_item
|
|
$(if $(wildcard $(TARFILE_LOCATION)/$2),, \
|
|
cd $(TARFILE_LOCATION)/tmp \
|
|
$(call fetch_Download__wget_command,$1,$2) \
|
|
$(if $3,$(call fetch_Download__checksum_command,$2,$3)) \
|
|
&& mv $2 ../ \
|
|
)
|
|
|
|
endef
|
|
|
|
# fetch_Download__is_checksum checksum
|
|
define fetch_Download__is_checksum
|
|
$(filter 32,$(words $(shell echo $(1) | sed -e 's/./& /g')))
|
|
endef
|
|
|
|
define fetch_Download__subst_var
|
|
$(subst _TTF,_SHA256SUM,$(subst _DLL,_SHA256SUM,$(subst _TARBALL,_SHA256SUM,$(subst _PACK,_SHA256SUM,$(subst _JAR,_SHA256SUM,$(1))))))
|
|
endef
|
|
|
|
# fetch_Download_item url variable-name
|
|
define fetch_Download_item
|
|
$(if $(strip $($(2))),,$(error fetch__Download_item: $(2) is empty))
|
|
$(if $(filter undefined,$(origin $(call fetch_Download__subst_var,$(2)))),\
|
|
$(error "fetch_Download_item: no checksum found for $($(2)). Please define $(call fetch_Download__subst_var,$(2)) in download.lst."),\
|
|
$(call fetch__Download_item,$(1),$($2),$($(call fetch_Download__subst_var,$(2)))) \
|
|
)
|
|
|
|
endef
|
|
|
|
# fetch_Download_item url tarball-name
|
|
define fetch_Download_item_unchecked
|
|
$(call fetch__Download_item,$1,$2)
|
|
|
|
endef
|
|
|
|
fetch_BUILD_TYPE := $(sort $(BUILD_TYPE))
|
|
ifneq ($(CROSS_COMPILING),)
|
|
fetch_BUILD_TYPE := $(sort $(fetch_BUILD_TYPE) $(shell . $(SRCDIR)/bin/get_config_variables --build BUILD_TYPE && echo $$BUILD_TYPE))
|
|
endif
|
|
|
|
# Return variable-name if this tarball should be fetched.
|
|
#
|
|
# This function is used for tarballs predefined in download.lst.
|
|
#
|
|
# fetch_Optional build-type variable-name
|
|
define fetch_Optional
|
|
$(if $(filter ALL,$(DO_FETCH_TARBALLS))$(filter $1,$(fetch_BUILD_TYPE)),$2)
|
|
endef
|
|
|
|
# Return variable-name if this pack should be fetched.
|
|
#
|
|
# This function is used for packs defined by configure.
|
|
#
|
|
# fetch_Optional_pack variable-name
|
|
define fetch_Optional_pack
|
|
$(if $(strip $($(1))),$(1))
|
|
endef
|
|
|
|
download: $(WORKDIR)/download
|
|
|
|
$(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(SRCDIR)/Makefile.fetch
|
|
-@mkdir -p $(TARFILE_LOCATION)/tmp
|
|
@date >> $(fetch_LOGFILE)
|
|
$(foreach item, \
|
|
$(call fetch_Optional,ABW,ABW_TARBALL) \
|
|
$(call fetch_Optional,AFDKO,AFDKO_TARBALL) \
|
|
$(call fetch_Optional,AFDKO,ANTLR4CPPRUNTIME_TARBALL) \
|
|
$(call fetch_Optional,ARGON2,ARGON2_TARBALL) \
|
|
$(call fetch_Optional,BOOST,BOOST_TARBALL) \
|
|
$(call fetch_Optional,BOX2D,BOX2D_TARBALL) \
|
|
$(call fetch_Optional,BREAKPAD,BREAKPAD_TARBALL) \
|
|
$(call fetch_Optional,BSH,BSH_TARBALL) \
|
|
$(call fetch_Optional,BZIP2,BZIP2_TARBALL) \
|
|
$(call fetch_Optional,CAIRO,CAIRO_TARBALL) \
|
|
$(call fetch_Optional,CAIRO,PIXMAN_TARBALL) \
|
|
$(call fetch_Optional,CDR,CDR_TARBALL) \
|
|
$(call fetch_Optional,CLUCENE,CLUCENE_TARBALL) \
|
|
$(call fetch_Optional,DRAGONBOX,DRAGONBOX_TARBALL) \
|
|
$(call fetch_Optional,FAST_FLOAT,FAST_FLOAT_TARBALL) \
|
|
$(call fetch_Optional,LIBCMIS,LIBCMIS_TARBALL) \
|
|
$(call fetch_Optional,COINMP,COINMP_TARBALL) \
|
|
$(call fetch_Optional,CPPUNIT,CPPUNIT_TARBALL) \
|
|
$(call fetch_Optional,CURL,CURL_TARBALL) \
|
|
$(call fetch_Optional,EBOOK,EBOOK_TARBALL) \
|
|
$(call fetch_Optional,EPM,EPM_TARBALL) \
|
|
$(call fetch_Optional,EPUBGEN,EPUBGEN_TARBALL) \
|
|
$(call fetch_Optional,ETONYEK,ETONYEK_TARBALL) \
|
|
$(call fetch_Optional,EXPAT,EXPAT_TARBALL) \
|
|
$(call fetch_Optional,FIREBIRD,FIREBIRD_TARBALL) \
|
|
$(call fetch_Optional,FONTCONFIG,FONTCONFIG_TARBALL) \
|
|
$(call fetch_Optional,FREEHAND,FREEHAND_TARBALL) \
|
|
$(call fetch_Optional,FREETYPE,FREETYPE_TARBALL) \
|
|
$(call fetch_Optional,FROZEN,FROZEN_TARBALL) \
|
|
$(call fetch_Optional,EPOXY,EPOXY_TARBALL) \
|
|
$(call fetch_Optional,GLM,GLM_TARBALL) \
|
|
$(call fetch_Optional,GPGMEPP,GPGME_TARBALL) \
|
|
$(call fetch_Optional,GRAPHITE,GRAPHITE_TARBALL) \
|
|
$(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \
|
|
$(call fetch_Optional,HSQLDB,HSQLDB_TARBALL) \
|
|
$(call fetch_Optional,HUNSPELL,HUNSPELL_TARBALL) \
|
|
$(call fetch_Optional,HYPHEN,HYPHEN_TARBALL) \
|
|
$(if $(filter WNT,$(OS)),IACCESSIBLE2_TARBALL) \
|
|
$(call fetch_Optional,ICU,ICU_TARBALL) \
|
|
$(call fetch_Optional,ICU,ICU_DATA_TARBALL) \
|
|
$(call fetch_Optional,JAVA_WEBSOCKET,JAVA_WEBSOCKET_TARBALL) \
|
|
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_FLOW_ENGINE_TARBALL) \
|
|
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_FLUTE_TARBALL) \
|
|
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_LIBBASE_TARBALL) \
|
|
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_LIBFONTS_TARBALL) \
|
|
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_LIBFORMULA_TARBALL) \
|
|
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_LIBLAYOUT_TARBALL) \
|
|
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_LIBLOADER_TARBALL) \
|
|
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_LIBREPOSITORY_TARBALL) \
|
|
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_LIBSERIALIZER_TARBALL) \
|
|
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_LIBXML_TARBALL) \
|
|
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_SAC_TARBALL) \
|
|
$(call fetch_Optional,LIBJPEG_TURBO,LIBJPEG_TURBO_TARBALL) \
|
|
$(call fetch_Optional,LCMS2,LCMS2_TARBALL) \
|
|
$(call fetch_Optional,LIBATOMIC_OPS,LIBATOMIC_OPS_TARBALL) \
|
|
$(call fetch_Optional,LIBASSUAN,LIBASSUAN_TARBALL) \
|
|
$(call fetch_Optional,LIBEOT,LIBEOT_TARBALL) \
|
|
$(call fetch_Optional,LIBEXTTEXTCAT,LIBEXTTEXTCAT_TARBALL) \
|
|
$(call fetch_Optional,LIBFFI,LIBFFI_TARBALL) \
|
|
$(call fetch_Optional,LIBGPGERROR,LIBGPGERROR_TARBALL) \
|
|
$(call fetch_Optional,LIBLANGTAG,LANGTAGREG_TARBALL) \
|
|
$(call fetch_Optional,LIBLANGTAG,LIBLANGTAG_TARBALL) \
|
|
$(call fetch_Optional,LIBNUMBERTEXT,LIBNUMBERTEXT_TARBALL) \
|
|
$(call fetch_Optional,LIBPNG,LIBPNG_TARBALL) \
|
|
$(call fetch_Optional,LIBTIFF,LIBTIFF_TARBALL) \
|
|
$(call fetch_Optional,LIBTOMMATH,LIBTOMMATH_TARBALL) \
|
|
$(call fetch_Optional,LIBWEBP,LIBWEBP_TARBALL) \
|
|
$(call fetch_Optional,LIBXML2,LIBXML_TARBALL) \
|
|
$(call fetch_Optional,XMLSEC,XMLSEC_TARBALL) \
|
|
$(call fetch_Optional,LIBXSLT,LIBXSLT_TARBALL) \
|
|
$(call fetch_Optional,LXML,LXML_TARBALL) \
|
|
$(call fetch_Optional,LZMA,LZMA_TARBALL) \
|
|
$(call fetch_Optional,MARIADB_CONNECTOR_C,MARIADB_CONNECTOR_C_TARBALL) \
|
|
$(call fetch_Optional,MD4C,MD4C_TARBALL) \
|
|
$(call fetch_Optional,MDDS,MDDS_TARBALL) \
|
|
$(call fetch_Optional,ZXCVBN,ZXCVBN_C_TARBALL) \
|
|
$(call fetch_Optional,ZXING,ZXING_TARBALL) \
|
|
$(call fetch_Optional,MDNSRESPONDER,MDNSRESPONDER_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_CALADEA_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_CARLITO_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_DEJAVU_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_NARROW_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_LINLIBERTINEG_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_KUFI_ARABIC_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_ARABIC_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_NASKH_ARABIC_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_HEBREW_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_HEBREW_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_ARMENIAN_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_ARMENIAN_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_GEORGIAN_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_GEORGIAN_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_LAO_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_LAO_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_LISU_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_AMIRI_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_REEM_TARBALL) \
|
|
$(call fetch_Optional,MORE_FONTS,FONT_SCHEHERAZADE_TARBALL) \
|
|
$(call fetch_Optional,MESON,MESON_TARBALL) \
|
|
$(call fetch_Optional,MSPUB,MSPUB_TARBALL) \
|
|
$(call fetch_Optional,MWAW,MWAW_TARBALL) \
|
|
$(call fetch_Optional,MYTHES,MYTHES_TARBALL) \
|
|
$(call fetch_Optional,NSS,NSS_TARBALL) \
|
|
$(call fetch_Optional,ODFGEN,ODFGEN_TARBALL) \
|
|
$(call fetch_Optional,ONLINEUPDATE,ONLINEUPDATE_TARBALL) \
|
|
$(call fetch_Optional,OPENLDAP,OPENLDAP_TARBALL) \
|
|
$(call fetch_Optional,OPENSSL,OPENSSL_TARBALL) \
|
|
$(call fetch_Optional,ORCUS,ORCUS_TARBALL) \
|
|
$(call fetch_Optional,PAGEMAKER,PAGEMAKER_TARBALL) \
|
|
$(call fetch_Optional,PDFIUM,PDFIUM_TARBALL) \
|
|
$(call fetch_Optional,POPPLER,POPPLER_TARBALL) \
|
|
$(call fetch_Optional,POPPLER,POPPLER_DATA_TARBALL) \
|
|
$(call fetch_Optional,POSTGRESQL,POSTGRESQL_TARBALL) \
|
|
$(call fetch_Optional,PYTHON,PYTHON_TARBALL) \
|
|
$(if $(filter WNT,$(OS)),PYTHON_BOOTSTRAP_TARBALL) \
|
|
$(call fetch_Optional,QUICKJS,QUICKJS_TARBALL) \
|
|
$(call fetch_Optional,QXP,QXP_TARBALL) \
|
|
$(call fetch_Optional,REDLAND,RAPTOR_TARBALL) \
|
|
$(call fetch_Optional,REDLAND,RASQAL_TARBALL) \
|
|
$(call fetch_Optional,REDLAND,REDLAND_TARBALL) \
|
|
$(call fetch_Optional,REVENGE,REVENGE_TARBALL) \
|
|
$(call fetch_Optional,RHINO,RHINO_TARBALL) \
|
|
$(call fetch_Optional,SKIA,SKIA_TARBALL) \
|
|
$(call fetch_Optional,SQLITE3,SQLITE3_TARBALL) \
|
|
$(call fetch_Optional,STAROFFICE,STAROFFICE_TARBALL) \
|
|
$(if $(filter WNT,$(OS)),TWAIN_DSM_TARBALL) \
|
|
$(call fetch_Optional,VISIO,VISIO_TARBALL) \
|
|
$(call fetch_Optional,WPD,WPD_TARBALL) \
|
|
$(call fetch_Optional,WPG,WPG_TARBALL) \
|
|
$(call fetch_Optional,WPS,WPS_TARBALL) \
|
|
$(call fetch_Optional,XSLTML,XSLTML_TARBALL) \
|
|
$(call fetch_Optional,YRS,YRS_TARBALL) \
|
|
$(call fetch_Optional,ZLIB,ZLIB_TARBALL) \
|
|
$(call fetch_Optional,ZSTD,ZSTD_TARBALL) \
|
|
$(call fetch_Optional,ZMF,ZMF_TARBALL) \
|
|
,$(call fetch_Download_item,https://dev-www.libreoffice.org/src,$(item)))
|
|
$(foreach item, \
|
|
$(call fetch_Optional,OPENSYMBOL,OPENSYMBOL_TTF) \
|
|
$(call fetch_Optional,ODFVALIDATOR,ODFVALIDATOR_JAR) \
|
|
$(call fetch_Optional,OFFICEOTRON,OFFICEOTRON_JAR) \
|
|
$(call fetch_Optional,VERAPDF,VERAPDF_JAR) \
|
|
,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item)))
|
|
-@mkdir -p $(TARFILE_LOCATION)/cargo
|
|
$(if $(call fetch_Optional,YRS,1),\
|
|
CARGO_HOME=$(TARFILE_LOCATION)/cargo cargo fetch $(if $(verbose),--verbose,) --locked --manifest-path $(SRCDIR)/external/y-crdt/Cargo.toml)
|
|
@mkdir -p $(dir $@) && touch $@
|
|
@mkdir -p $(dir $@)/Executable
|
|
|
|
# vim: set noet sw=4 ts=4:
|