Author: hdu
Date: Thu Dec 12 17:38:18 2013
New Revision: 1550457
URL: http://svn.apache.org/r1550457
Log:
#i123532# avoid build breaker when pkgformat contains an "archive" target
If the configure option --with-package-format contains an "archive" target
then instset_native makefile.mk has two build targets with the same name.
This breaks the build. The temporary fix here disables the second recipe
to allow the buildbots to work again.
Modified:
openoffice/trunk/main/instsetoo_native/util/makefile.mk
Modified: openoffice/trunk/main/instsetoo_native/util/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/util/makefile.mk?rev=1550457&r1=1550456&r2=1550457&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/util/makefile.mk (original)
+++ openoffice/trunk/main/instsetoo_native/util/makefile.mk Thu Dec 12 17:38:18
2013
@@ -259,14 +259,14 @@ $(foreach,P,$(PACKAGE_FORMATS) $(foreach
$(PRJ)$/util$/update.xml \
> $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-$(foreach,L,$(alllangiso) openoffice_$L.archive) :
- $(MAKE_INSTALLER_COMMAND) \
- -p Apache_OpenOffice \
- -msitemplate $(MSIOFFICETEMPLATEDIR)
- $(GEN_UPDATE_INFO_COMMAND) \
- --product Apache_OpenOffice \
- $(PRJ)$/util$/update.xml \
- > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+#$(foreach,L,$(alllangiso) openoffice_$L.archive) :
+# $(MAKE_INSTALLER_COMMAND) \
+# -p Apache_OpenOffice \
+# -msitemplate $(MSIOFFICETEMPLATEDIR)
+# $(GEN_UPDATE_INFO_COMMAND) \
+# --product Apache_OpenOffice \
+# $(PRJ)$/util$/update.xml \
+# > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
#openofficewithjre_%{$(PKGFORMAT:^".")} :
$(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso)
openofficewithjre_$L.$P)) .PHONY :
