[PATCH] fdo#39643: Remove --disable-strip-solver configure option

[Stephan Bergmann]

On 04/26/2012 10:59 AM, Petr Mladek wrote:
> I have also added -strip option when generating the LibreOffice
> installation set to make sure that the official build is the same as it
> was before.

Looks like

> diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
> index 70e9273..94187ee 100644
> --- a/instsetoo_native/util/makefile.mk
> +++ b/instsetoo_native/util/makefile.mk
> @@ -245,7 +245,7 @@ $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
>  .ENDIF			# "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
>  .ENDIF			# "$(MAKETARGETS)"!=""
>  openoffice_%{$(PKGFORMAT:^".") .archive} :
> -    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
> +    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -strip -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 LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
>
>  $(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}

is not needed after all (freenode #libreoffice-dev):

> Jun 19 17:12:03 <sberg> pmladek, Sweetshark, 65840941eeeab7021168a17797b6129ea15a722d fixing fdo#39643 still strips archive builds in instsetoo_native/util/makefile.mk -- any insight whether that is by design or by mistake?
> Jun 19 17:12:10 <IZBot> core - fdo#39643: Remove --disable-strip-solver configure option - http://cgit.freedesktop.org/libreoffice/core/commit/?id=65840941eeeab7021168a17797b6129ea15a722d
> Jun 19 17:20:37 <pmladek> sberg: AFAIK, the stripping is by desing because we want to have the official download as small as possible
> Jun 19 17:21:21 <pmladek> sberg: we do not build the official release with -g, so the info was not much useful anyway; the strip still safes something
> Jun 19 17:22:16 <sberg> pmladek, yes, found your reply to "[PATCH] fdo#39643: Remove --disable-strip-solver configure option" thread now where you explicitly add -strip for .archive
> Jun 19 17:22:23 <IZBot> LibreOffice-Libreoffice normal/medium RESOLVED FIXED [EasyHack] Remove --disable-strip-solver configure option and default to never strip, when copying to solver https://bugs.freedesktop.org/show_bug.cgi?id=39643
> Jun 19 17:22:43 <sberg> pmladek, what "official release" is that being built in archive (.tar.gz) form, btw?
> Jun 19 17:24:15 <sberg> pmladek, is that the LOdev snapshots?  (I'd think the official releases are produced as rpm etc., no?)
> Jun 19 17:25:05 <pmladek> sberg: my understanding is that developers, linux packagers (almost everyone) use "make install" or "make dev-install" and these do not strip
> Jun 19 17:26:00 <sberg> pmladek, yes, sure; but some devs sometimes explicitly build archive sets in insetsetoo_native (and then wonder why they get stripped)  ;)
> Jun 19 17:26:09 <pmladek> sberg: IMHO, the rpms, debs, tarballs and other stuff produced in instsetoo_native is used only for the official release
> Jun 19 17:26:56 <pmladek> sberg: ah, I see
> Jun 19 17:27:08 <sberg> pmladek, but the only target calling make_installer.pl with -strip is .archive -- thats what makes me wonder
> Jun 19 17:30:46 <pmladek> sberg: heh, you are right
> Jun 19 17:31:09 <pmladek> sberg: I agree that it does not make much sense
> Jun 19 17:31:18 <pmladek> sberg: Feel free to remove it
> Jun 19 17:32:12 <pmladek> sberg: We just need to double check the that binaries in rpms, debs, MAC, windows packs are stripped
> Jun 19 17:33:06 <sberg> pmladek, then again, <http://www.libreoffice.org/download/pre-releases/> offers .tar.gz that I would assume are built from instsetoo_native .archive target
> Jun 19 17:33:37 <sberg> pmladek, so might or might not be a good idea to keep them stripped (to reduce size)?
> Jun 19 17:35:24 <pmladek> sberg: The tar.gz at download/pre-releases includes rpms or debs while  the tar.gz in archive has the installer tree
> Jun 19 17:35:57 <pmladek> sberg: I am not 100% sure how the rpms and debs are created and where the files are stripped
> Jun 19 17:36:07 <pmladek> sberg: I guess that it is independent
> Jun 19 17:36:22 <pmladek> sberg: I guess that the files are always takes from solver
> Jun 19 17:36:38 <sberg> pmladek, ah right, the .tar.gz fooled me into thinking it is .archive...
> Jun 19 17:37:08 <sberg> pmladek, so should indeed be safe to remove -strip from instsetoo_native/util/makefile.mk .archive target again; will do
> Jun 19 17:37:32 <pmladek> sberg: I think that the rpm/deb tools strip binaries by default; this is why it most like works even without the --strip option
> Jun 19 17:37:56 <pmladek> sberg: yup, let's try to remove it

so removed it now again with 
<http://cgit.freedesktop.org/libreoffice/core/commit/?id=6bb8dbf8072caedd2f79faa9e72fddd63541baad> 
"No need to strip archive sets."

Stephan