[ooo-build-commit] .: patches/dev300

[Jan Holesovsky]

 patches/dev300/apply                                  |    3 
 patches/dev300/buildfix-instsetoo_native-targets.diff |   68 ++++++++++++++++++
 2 files changed, 71 insertions(+)

New commits:
commit 5c05d8a22e3b2558b5773ee254d9a1668b7e8fc1
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue May 25 10:46:00 2010 +0200

    Fix build of instsetoo_native.
    
    * patches/dev300/apply:
    * patches/dev300/buildfix-instsetoo_native-targets.diff: Add .archive flags.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 27109ea..669635a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -280,6 +280,9 @@ sc-cellsuno-avoid-early-destruction.diff, i#90076, pmladek
 # don't let HelpLinker be miscompiled with g++ 4.3
 # FIXME dev300-m77 gcc-HelpLinker.diff # RENAMED transex3 -> l10ntools
 
+# add the .archive flag to some instsetoo_native/util/makefile.mk rules
+buildfix-instsetoo_native-targets.diff, i#111813, jholesov
+
 [ TemporaryHacks < dev300-m78 ]
 # fix build in shell; this is in m78
 buildfix-enable-lockdown.diff, jholesov
diff --git a/patches/dev300/buildfix-instsetoo_native-targets.diff b/patches/dev300/buildfix-instsetoo_native-targets.diff
new file mode 100644
index 0000000..0c1979c
--- /dev/null
+++ b/patches/dev300/buildfix-instsetoo_native-targets.diff
@@ -0,0 +1,68 @@
+--- instsetoo_native/util/makefile.mk	2010-05-25 10:29:33.000000000 +0200
++++ instsetoo_native/util/makefile.mk	2010-05-25 10:32:19.000000000 +0200
+@@ -215,32 +215,32 @@ openoffice_%{$(PKGFORMAT:^".") .archive}
+     $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+ 
+ $(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
+-openofficewithjre_%{$(PKGFORMAT:^".")} :
++openofficewithjre_%{$(PKGFORMAT:^".") .archive} :
+     $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+ 
+ $(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
+-openofficedev_%{$(PKGFORMAT:^".")} :
++openofficedev_%{$(PKGFORMAT:^".") .archive} :
+     $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+     $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+ 
+ $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
+-ooolanguagepack_%{$(PKGFORMAT:^".")} :
++ooolanguagepack_%{$(PKGFORMAT:^".") .archive} :
+     $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
+ 
+ $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
+-ooodevlanguagepack_%{$(PKGFORMAT:^".")} :
++ooodevlanguagepack_%{$(PKGFORMAT:^".") .archive} :
+     $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
+ 
+ $(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^".")}
+-sdkoo_%{$(PKGFORMAT:^".")} :
++sdkoo_%{$(PKGFORMAT:^".") .archive} :
+     $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
+ 
+ $(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")}
+-sdkoodev_%{$(PKGFORMAT:^".")} :
++sdkoodev_%{$(PKGFORMAT:^".") .archive} :
+     $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
+ 
+ $(foreach,i,$(alllangiso) ure_$i) : $$@{$(PKGFORMAT:^".")}
+-ure_%{$(PKGFORMAT:^".")} :
++ure_%{$(PKGFORMAT:^".") .archive} :
+ .IF "$(OS)" == "MACOSX"
+     @echo 'for now, there is no standalone URE for Mac OS X'
+ .ELSE
+@@ -257,21 +257,21 @@ $(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
+ $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
+ .ENDIF			# "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
+ .ENDIF			# "$(MAKETARGETS)"!=""
+-broffice_%{$(PKGFORMAT:^".")} :
++broffice_%{$(PKGFORMAT:^".") .archive} :
+     +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+     $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product BrOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+ 
+ $(foreach,i,$(alllangiso) brofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
+-brofficewithjre_%{$(PKGFORMAT:^".")} :
++brofficewithjre_%{$(PKGFORMAT:^".") .archive} :
+     +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+ 
+ $(foreach,i,$(alllangiso) brofficedev_$i) : $$@{$(PKGFORMAT:^".")}
+-brofficedev_%{$(PKGFORMAT:^".")} :
++brofficedev_%{$(PKGFORMAT:^".") .archive} :
+     +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+     $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product BrOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+ 
+ $(foreach,i,$(alllangiso) broolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
+-broolanguagepack_%{$(PKGFORMAT:^".")} :
++broolanguagepack_%{$(PKGFORMAT:^".") .archive} :
+     +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
+ 
+ .ELSE			# "$(alllangiso)"!=""