diff options
| -rw-r--r-- | Repository.mk | 2 | ||||
| -rw-r--r-- | RepositoryModule_host.mk | 2 | ||||
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | desktop/Pagein_common.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 17 |
6 files changed, 15 insertions, 11 deletions
diff --git a/Repository.mk b/Repository.mk index 26556af6896c..15c34813c550 100644 --- a/Repository.mk +++ b/Repository.mk @@ -431,7 +431,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,URE, \ $(if $(SOLAR_JAVA),sunjavaplugin) \ unoidl \ unsafe_uno \ - $(if $(MERGELIBS),urelibs) \ + $(if $(URELIBS),urelibs) \ xmlreader \ $(if $(filter MSC,$(COM)),$(if $(filter INTEL,$(CPUNAME)),msci,mscx),gcc3)_uno \ )) diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index a8bf87df7731..3b425d096876 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -240,7 +240,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ ifneq ($(MERGELIBS),) $(eval $(call gb_Module_add_targets,libreoffice,\ Library_merged \ - Library_urelibs \ + $(if $(URELIBS),Library_urelibs) \ )) endif diff --git a/config_host.mk.in b/config_host.mk.in index fcfccd382550..4256fa7a03e9 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -536,6 +536,7 @@ export TYPO_EXTENSION_PACK=@TYPO_EXTENSION_PACK@ export UNIXWRAPPERNAME=@UNIXWRAPPERNAME@ export UNOWINREG_DLL=@UNOWINREG_DLL@ export UPD=@UPD@ +export URELIBS=@URELIBS@ export USE_FT_EMBOLDEN=@USE_FT_EMBOLDEN@ export USE_XINERAMA=@USE_XINERAMA@ export use_shl_version=@use_shl_version@ diff --git a/configure.ac b/configure.ac index e34e9652c469..64e574e72c02 100644 --- a/configure.ac +++ b/configure.ac @@ -11723,6 +11723,7 @@ if test -n "$enable_mergelibs" -a "$enable_mergelibs" != "no"; then fi if test "$enable_mergelibs" = "all"; then MERGELIBS="ALL" + URELIBS="TRUE" else MERGELIBS="CORE" fi @@ -11731,6 +11732,7 @@ else AC_MSG_RESULT([no]) fi AC_SUBST([MERGELIBS]) +AC_SUBST([URELIBS]) # =================================================================== # Create hardlinks on deliver instead of copying for smaller size and speed up diff --git a/desktop/Pagein_common.mk b/desktop/Pagein_common.mk index d6ec2f935783..f13ac72675a9 100644 --- a/desktop/Pagein_common.mk +++ b/desktop/Pagein_common.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Pagein_Pagein,common)) # sorted in approx. reverse load order (ld.so.1) $(eval $(call gb_Pagein_add_objects,common,\ $(if $(MERGELIBS),merged) \ - $(if $(MERGELIBS),urelibs) \ + $(if $(URELIBS),urelibs) \ i18nlangtag \ $(if $(findstring YES,$(SYSTEM_ICU)),,\ icui18n \ diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 4bbb22ec59ed..a799aaacc364 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -179,20 +179,21 @@ gb_MERGEDLIBS := \ xstor \ $(if $(filter ALL,$(MERGELIBS)),$(gb_EXTRAMERGEDLIBS)) +ifneq (,$(URELIBS)) gb_URELIBS := \ + cppu \ + cppuhelper \ $(if $(filter TRUE,$(SOLAR_JAVA)),jvmaccess) \ $(if $(filter TRUE,$(SOLAR_JAVA)),jvmfwk) \ + purpenvhelper \ reg \ + sal \ + salhelper \ store \ unoidl \ - xmlreader \ - $(if $(filter ALL,$(MERGELIBS)), \ - cppu \ - cppuhelper \ - purpenvhelper \ - sal \ - salhelper \ - ) + xmlreader + +endif endif |