The following commit has been merged in the debian-experimental-3.6 branch:
commit 83f2f18da6e68dcdd81e9de2d300a7f24ba532bd
Author: Rene Engelhard <r...@debian.org>
Date: Tue Aug 21 13:10:40 2012 +0200
uild only with en-US in build-arch first and build sdext/mysqlc manually
with all languages after make check; remove buildd special-casing for languages
diff --git a/changelog b/changelog
index 2a7c3ac..0724307 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,12 @@ libreoffice (1:3.6.1~rc1-3) UNRELEASED; urgency=low
* debian/patches/debian-debug.diff: patch new gb_SYMBOLS in unxgcc.mk to
make ENABLE_SYMBOLS=SMALL (-g1) working again..
+ * debian/rules:
+ - save some space/build time: build only with en-US in build-arch first
+ and build sdext/mysqlc (localized help/descriptions) manually with all
+ languages after make check
+ - remove buildd special-casing for languages
+
-- Rene Engelhard <r...@debian.org> Mon, 20 Aug 2012 18:33:08 +0200
libreoffice (1:3.6.1~rc1-2) experimental; urgency=low
diff --git a/rules b/rules
index b8610c5..5e57a1d 100755
--- a/rules
+++ b/rules
@@ -480,11 +480,6 @@ OOO_BINFILTER_ARCHS:=$(filter-out arm% mips% m68k,
$(OOO_ARCHS))
# Debian
ifeq "$(DEB_VENDOR)" "Debian"
- # we don't need to build all languages and the thesaurus on the buildds;
- # they do binary-only builds anyway
- ifeq ($(ON_BUILDD),y)
- BUILD_ONLY_EN_US=y
- endif
CONFIGURE_FLAGS += --with-intro-progressbar-color=215,7,81
endif
@@ -742,7 +737,7 @@ BUILD_ISOS = $(ISOS)
ifneq "$(BUILD_ONLY_EN_US)" "y"
ifneq "$(BUILD_ISOS)" "en-US"
- CONFIGURE_FLAGS += --with-lang="$(BUILD_ISOS)"
+ CONFIGURE_FLAGS_LANG += --with-lang="$(BUILD_ISOS)"
endif
endif
@@ -1610,6 +1605,17 @@ ifneq (nocheck,$(findstring
nocheck,$(DEB_BUILD_OPTIONS)))
$(CURDIR)/debian/rules check
endif
+ifneq "$(BUILD_ISOS)" "en-US"
+ # build some extensions again with all languages; as it contains
language-specific help
+ # and/or descriptions...
+ $(MAKE) translations.clean
+ $(MAKE) sdext.clean
+ $(MAKE) mysqlc.clean
+ make cmd cmd="cd translations; export WITH_LANG='$(LANGPACKISOS)';
export WITH_LANG_LIST='$(LANGPACKISOS)'; $(MAKE)"
+ make cmd cmd="cd sdext; export WITH_LANG='$(LANGPACKISOS)'; export
WITH_LANG_LIST='$(LANGPACKISOS)'; $(MAKE)"
+ make cmd cmd="cd mysqlc; export WITH_LANG='$(LANGPACKISOS)'; export
WITH_LANG_LIST='$(LANGPACKISOS)'; ../solenv/bin/build.pl &&
../solenv/bin/deliver.pl"
+endif
+
touch $@
build-indep: $(STAMP_DIR)/prepare $(STAMP_DIR)/build-arch
$(STAMP_DIR)/build-indep
@@ -1621,7 +1627,7 @@ $(STAMP_DIR)/build-indep:
$(MAKE) scp2.clean
rm -f config.status autogen.lastrun
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH)
./autogen.sh $(CONFIGURE_FLAGS)
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH)
./autogen.sh $(CONFIGURE_FLAGS) $(CONFIGURE_FLAGS_LANG)
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH)
DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d`
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) build gb_FULLDEPS=
gb_Deliver_HARDLINK=T
--
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/e1t3p2v-00039d...@vasks.debian.org
