[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_3.6.4_rc3-1-269-g6510898
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit e359c636a845ed5f953b67e66595f9b9d39eceab
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Sun Nov 25 00:03:13 2012 +0100
try mergedlibs
diff --git a/rules b/rules
index dbb18c8..daf3c5f 100755
--- a/rules
+++ b/rules
@@ -330,6 +330,7 @@ USE_UCPP=n
ifeq "$(USE_UCPP)" "y"
SYSTEM_STUFF += ucpp
endif
+ENABLE_MERGEDLIBS=n
# Default flags to pass to configure
CONFIGURE_FLAGS= \
@@ -356,6 +357,7 @@ endif
CONFIGURE_FLAGS += --with-alloc=$(ALLOC)
+
#############
# Architecture-specific changes
@@ -517,6 +519,7 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
#temp. hacks
ENABLE_EVO2:=n
PACKAGE_LIBRELOGO=n # temporary: still commented on debian for the control file generation
+ ENABLE_MERGEDLIBS=y
ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
ENABLE_HELP=n
endif
@@ -1212,6 +1215,10 @@ ifneq (ccache,$(findstring ccache,$(DEB_BUILD_OPTIONS)))
CONFIGURE_FLAGS += --disable-ccache
endif
+ifneq ($(ENABLE_LIBMERGED),y)
+CONFIGURE_FLAGS += --enable-mergedlibs
+endif
+
## Build n projects in parallel?
## DEB_BUILD_OPTIONS=parallel=<n>
## if not specified LibreOffices configure tries to find it out itself
--
LibreOffice packaging repository
Reply to: