diff options
| -rw-r--r-- | Makefile.fetch | 1 | ||||
| -rw-r--r-- | RepositoryExternal.mk | 30 | ||||
| -rw-r--r-- | config_host.mk.in | 3 | ||||
| -rw-r--r-- | configure.ac | 24 | ||||
| -rw-r--r-- | download.lst | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | onlineupdate/Executable_updater.mk | 5 |
7 files changed, 61 insertions, 4 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index 390d3d0d705e..87c8b8a21d39 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -112,6 +112,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,APR,APR_UTIL_TARBALL) \ $(call fetch_Optional,BOOST,BOOST_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) \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 3ea67b804939..0592dea01200 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -4120,4 +4120,34 @@ endef endif +ifneq ($(ENABLE_ONLINE_UPDATE_MAR),) +ifneq ($(SYSTEM_BZIP2),) + +define gb_LinkTarget__use_bzip2 +$(call gb_LinkTarget_set_include,$(1),\ + $(BZIP2_CFLAGS) \ + $$(INCLUDE) \ +) +$(call gb_LinkTarget_add_libs,$(1),$(BZIP2_LIBS)) + +endef +gb_ExternalProject__use_bzip2 := + +else # !SYSTEM_BZIP2 + +define gb_LinkTarget__use_bzip2 +$(call gb_LinkTarget_use_external_project,$(1),bzip2) +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,bzip2) \ + $$(INCLUDE) \ +) +endef + +define gb_ExternalProject__use_bzip2 +$(call gb_ExternalProject_use_external_project,$(1),bzip2) +endef + +endif +endif + # vim: set noet sw=4 ts=4: diff --git a/config_host.mk.in b/config_host.mk.in index 17c2306719b0..1d0702b4f728 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -48,6 +48,8 @@ export BUILD_TYPE=@BUILD_TYPE@ export BUILD_UNOWINREG=@BUILD_UNOWINREG@ export BUILD_VER_STRING=@BUILD_VER_STRING@ export BUILD_X64=@BUILD_X64@ +export BZIP2_CFLAGS=$(gb_SPACE)@BZIP2_CFLAGS@ +export BZIP2_LIBS=$(gb_SPACE)@BZIP2_LIBS@ export CAIRO_CFLAGS=$(gb_SPACE)@CAIRO_CFLAGS@ export CAIRO_LIBS=$(gb_SPACE)@CAIRO_LIBS@ export CC=@CC@ @@ -518,6 +520,7 @@ export SYSTEM_APACHE_COMMONS=@SYSTEM_APACHE_COMMONS@ export SYSTEM_APR=@SYSTEM_APR@ export SYSTEM_BOOST=@SYSTEM_BOOST@ export SYSTEM_BSH=@SYSTEM_BSH@ +export SYSTEM_BZIP2=@SYSTEM_BZIP2@ export SYSTEM_CAIRO=@SYSTEM_CAIRO@ export SYSTEM_CLUCENE=@SYSTEM_CLUCENE@ export SYSTEM_COLLADA2GLTF=@SYSTEM_COLLADA2GLTF@ diff --git a/configure.ac b/configure.ac index 06b2d5e32317..0325a2fbd1f3 100644 --- a/configure.ac +++ b/configure.ac @@ -1574,6 +1574,11 @@ AC_ARG_WITH(system-libs, [Use libraries already on system -- enables all --with-system-* flags.]), ,) +AC_ARG_WITH(system-bzip2, + AS_HELP_STRING([--with-system-bzip2], + [Use bzip2 already on system. Used only when --enable-online-update=mar]),, + [with_system_bzip2="$with_system_libs"]) + AC_ARG_WITH(system-headers, AS_HELP_STRING([--with-system-headers], [Use headers already on system -- enables all --with-system-* flags for @@ -11807,6 +11812,25 @@ AC_SUBST(ENABLE_ONLINE_UPDATE) AC_SUBST(ENABLE_ONLINE_UPDATE_MAR) dnl =================================================================== +dnl Test whether we need bzip2 +dnl =================================================================== +SYSTEM_BZIP2= +if test "$ENABLE_ONLINE_UPDATE_MAR" = "TRUE"; then + AC_MSG_CHECKING([whether to use system bzip2]) + if test "$with_system_bzip2" = yes; then + SYSTEM_BZIP2=TRUE + AC_MSG_RESULT([yes]) + PKG_CHECK_MODULES(BZIP2, bzip2) + else + AC_MSG_RESULT([no]) + BUILD_TYPE="$BUILD_TYPE BZIP2" + fi +fi +AC_SUBST(SYSTEM_BZIP2) +AC_SUBST(BZIP2_CFLAGS) +AC_SUBST(BZIP2_LIBS) + +dnl =================================================================== dnl Test whether to enable extension update dnl =================================================================== AC_MSG_CHECKING([whether to enable extension update]) diff --git a/download.lst b/download.lst index 54ed35b246c5..bf5a5d8f58bf 100644 --- a/download.lst +++ b/download.lst @@ -17,6 +17,7 @@ export APR_UTIL_MD5SUM := 71a11d037240b292f824ba1eb537b4e3 export APR_UTIL_TARBALL := apr-util-1.5.3.tar.gz export BOOST_TARBALL := d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 export BSH_TARBALL := ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip +export BZIP2_TARBALL := 00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz export CAIRO_TARBALL := f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz export CDR_MD5SUM := b33fd0be3befdd1b37777e08ce058bd9 export CDR_TARBALL := libcdr-0.1.1.tar.bz2 diff --git a/external/Module_external.mk b/external/Module_external.mk index 8b4fb6c58ccf..51900d573955 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -25,6 +25,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,APR,apr) \ $(call gb_Helper_optional,BOOST,boost) \ $(call gb_Helper_optional,BSH,beanshell) \ + $(call gb_Helper_optional,BZIP2,bzip2) \ $(call gb_Helper_optional,CAIRO,cairo) \ $(call gb_Helper_optional,CDR,libcdr) \ $(call gb_Helper_optional,CLUCENE,clucene) \ diff --git a/onlineupdate/Executable_updater.mk b/onlineupdate/Executable_updater.mk index f8537bebe4b8..30713c486556 100644 --- a/onlineupdate/Executable_updater.mk +++ b/onlineupdate/Executable_updater.mk @@ -50,12 +50,9 @@ $(eval $(call gb_Executable_add_libs,updater,\ $(GTK3_LIBS) \ )) -$(eval $(call gb_Executable_use_libraries,updater,\ - libreofficekitgtk \ -)) - $(eval $(call gb_Executable_use_externals,updater,\ gtk \ + bzip2 \ )) $(eval $(call gb_Executable_add_exception_objects,updater,\ |