The following commit has been merged in the debian-experimental-4.0 branch:
commit 66ed8baac1ca633a6aaa54577dfaafcc268d323a
Author: Rene Engelhard <r...@debian.org>
Date: Mon Dec 10 23:35:38 2012 +0100
add option to build with --enable-mergelibs, not yet enabled.
diff --git a/changelog b/changelog
index 46e3f47..e0d1279 100644
--- a/changelog
+++ b/changelog
@@ -23,6 +23,7 @@ libreoffice (1:4.0.0~beta1-1) UNRELEASED; urgency=low
- use --disable-dependency-tracking instead of gb_FULLDEPS=
- python3 is default now; reverse logic (use python3 per default and
and build python2 in a extra step)
+ - add option to build with --enable-mergelibs, not yet enabled.
* debian/uno-libs3.symbols: update
* debian/control*.in, debian/rules, debian/scripts/gid2pkgdirs.sh: binfilter
is gone. yay.
diff --git a/rules b/rules
index 2dbf7ca..b4c2a6f 100755
--- a/rules
+++ b/rules
@@ -334,6 +334,7 @@ USE_UCPP=n
ifeq "$(USE_UCPP)" "y"
SYSTEM_STUFF += ucpp
endif
+ENABLE_MERGELIBS=n
# Default flags to pass to configure
CONFIGURE_FLAGS= \
@@ -1196,6 +1197,10 @@ ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
BUILD_DEPS_INDEP += , fontforge
endif
+ifeq ($(ENABLE_MERGELIBS),y)
+ CONFIGURE_FLAGS += --enable-mergelibs
+endif
+
# Use compiler cache? Include ccache in DEB_BUILD_OPTIONS for much faster
rebuild times
# A complete build uses about 9G of compiler cache.
ifneq (ccache,$(findstring ccache,$(DEB_BUILD_OPTIONS)))
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1tic3m-0002qd...@vasks.debian.org
