The following commit has been merged in the debian-experimental-4.0 branch:
commit 9cd66aa5ff0a3acb6355a2419884e6ca51bb73e7
Author: Rene Engelhard <[email protected]>
Date: Tue Dec 18 18:38:33 2012 +0100
optimize build-arch build cleans (swext/reportbuilder can be in -indep) and
add clarifying comment
diff --git a/rules b/rules
index 3bd8428..7907eb5 100755
--- a/rules
+++ b/rules
@@ -1623,13 +1623,9 @@ ifneq "$(BUILD_ISOS)" "en-US"
# and/or descriptions...
$(MAKE) translations.clean
$(MAKE) sdext.clean
- $(MAKE) swext.clean
- $(MAKE) reportbuilder.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 swext; export WITH_LANG='$(LANGPACKISOS)'; export
WITH_LANG_LIST='$(LANGPACKISOS)'; $(MAKE)"
- make cmd cmd="cd reportbuilder; 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
@@ -1641,6 +1637,11 @@ $(STAMP_DIR)/build-indep:
$(MAKE) odk.clean
$(MAKE) scp2.clean
+ # FIXME: those are arch-indep but somehow fail in the second run
+ # with all languages - handle it like the ones in binary-arch. The
+ # rebuild automatically will be done, though.
+ $(MAKE) swext.clean
+ $(MAKE) reportbuilder.clean
rm -f config.status autogen.lastrun
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH)
./autogen.sh $(CONFIGURE_FLAGS) $(CONFIGURE_FLAGS_LANG)
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
