Re: [PATCH] fdo#39643: Remove --disable-strip-solver configure option
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
Re: [PATCH] fdo#39643: Remove --disable-strip-solver configure option
Hello Petr,
thank you for your review and your comments.
Here is a new version with these issues fixed:
1. no strip in solenv/bin/deliver.pl any more
2. solenv/bin/modules/installer preserves striping code
3. there is a new target install-strip that do strip during installation
process.
Question: i can not see where $strip var in ooinstall is parsed (in
make_installer.pl call)?
if ($ENV{BUILD_TYPE} =~ m/ODK/) {
print Running SDK installer\n;
system (cd $ENV{SRC_ROOT}/instsetoo_native/util ; .
perl -w $ENV{SOLARENV}/bin/make_installer.pl .
-f openoffice.lst -l en-US -p LibreOffice_SDK .
-u $tmp_dir .
-buildid $BUILD $destdir $strip $msi .
-simple $path) die Failed to install: $!;
}
For the new param in Makefile ooinstall -strip to be passed to
make_installer.pl I have to parse it myself in ooinstall, right?
Ciao
David
On 25.04.2012 16:56, Petr Mladek wrote:
d.ostrov...@idaia.de píše v Út 24. 04. 2012 v 11:33 +0200:
Do we agree about to drop the striping code from ooinstaller?
What do you mean by ooinstaller? Just the single ooinstall script or
also also the solenv/bin/modules/installer/* stuff?
It is hard to say until we know what is the benefit of stripping. If it
makes sense, you need to keep the support for make install-strip. It
will call ooinstall as well.
As far as I can see the use cases we have are:
Use Case (UC) 1: distro maintainer would build without -g, nothing to
be stripped.
This is not true. Many distro maintainers actually build with -g. They
later use some magic to put the debug information into separate
packages.
UC 2: developer with change, compile, test cycle would build with -g
and install LO with make install oder make dev-install. He wants
definitely preserve the symbols.
yup
UC 3: developer compiles it with symbols and want provide the build
artifacts to somebody to test.
It could be the only justification to provide a new make target
strip-and-install. But the tests with stripped
artifacts are useless, no deeper analysis is possible.
Developer might have the symbols to track the code in debugger to
understand how it works. A backtrace from user is useful only for
crashes or some other particular problems. It is not useful to check
that a functionality works as expected. If you have full debug build,
the stripped binaries can safe a lot for download.
When I think about it, we want to keep stripping capability in the
installer stuff for this purpose. Though, we want to disable it in the
default make install.
Another
argument for not to strip even in this case is a new configure option
that was introduced in the last hackfest to selectively specify the
list of libraries to build with symbols. With this option not the
whole LO but only a couple of libs would be built with symbols.
Yes, it might be better but I still think that strip might safe a lot
here on download.
Please, wait a bit. I am trying to build without -g and without
stripping to get some data. I am going crazy today because the binaries
are stripped in solver even when I use --disable-strip-solver. Sigh.
Best Regards,
Petr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
From 860462c53c8e33e77b57db0e693e508b0b39f40d Mon Sep 17 00:00:00 2001
From: David Ostrovsky david.ostrov...@gmx.de
Date: Wed, 25 Apr 2012 21:29:28 +0200
Subject: [PATCH] fdo#39643: Remove --disable-strip-solver configure option
---
Makefile |9 -
config_host.mk.in |1 -
configure.in | 30 ---
instsetoo_native/util/makefile.mk |8 ++--
solenv/bin/deliver.pl | 59 +
solenv/bin/modules/installer/globals.pm |2 +-
solenv/bin/modules/installer/parameter.pm |4 +-
solenv/bin/ooinstall |6 ---
solenv/gbuild/gbuild.mk |6 ---
solenv/gbuild/platform/solaris.mk |6 ---
solenv/gbuild/platform/unxgcc.mk |6 ---
11 files changed, 16 insertions(+), 121 deletions(-)
diff --git a/Makefile b/Makefile
index 9c18cd9..8993256 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-.PHONY : all bootstrap build check clean clean-build clean-host dev-install distclean distro-pack-install docs fetch findunusedcode id install subsequentcheck tags
+.PHONY : all bootstrap build check clean clean-build clean-host dev-install distclean distro-pack-install docs fetch findunusedcode id install install-strip subsequentcheck tags
ifeq ($(MAKECMDGOALS),)
MAKECMDGOALS:=all
@@ -439,6 +439,13 @@ install:
echo Installation finished, you can now execute: \
echo $(INSTALLDIR)/program/soffice
+install-strip:
+ echo Installing in $(INSTALLDIR)... \
+ ooinstall -strip
Re: [PATCH] fdo#39643: Remove --disable-strip-solver configure option
d.ostrov...@idaia.de píše v Út 24. 04. 2012 v 11:33 +0200: Do we agree about to drop the striping code from ooinstaller? What do you mean by ooinstaller? Just the single ooinstall script or also also the solenv/bin/modules/installer/* stuff? It is hard to say until we know what is the benefit of stripping. If it makes sense, you need to keep the support for make install-strip. It will call ooinstall as well. As far as I can see the use cases we have are: Use Case (UC) 1: distro maintainer would build without -g, nothing to be stripped. This is not true. Many distro maintainers actually build with -g. They later use some magic to put the debug information into separate packages. UC 2: developer with change, compile, test cycle would build with -g and install LO with make install oder make dev-install. He wants definitely preserve the symbols. yup UC 3: developer compiles it with symbols and want provide the build artifacts to somebody to test. It could be the only justification to provide a new make target strip-and-install. But the tests with stripped artifacts are useless, no deeper analysis is possible. Developer might have the symbols to track the code in debugger to understand how it works. A backtrace from user is useful only for crashes or some other particular problems. It is not useful to check that a functionality works as expected. If you have full debug build, the stripped binaries can safe a lot for download. When I think about it, we want to keep stripping capability in the installer stuff for this purpose. Though, we want to disable it in the default make install. Another argument for not to strip even in this case is a new configure option that was introduced in the last hackfest to selectively specify the list of libraries to build with symbols. With this option not the whole LO but only a couple of libs would be built with symbols. Yes, it might be better but I still think that strip might safe a lot here on download. Please, wait a bit. I am trying to build without -g and without stripping to get some data. I am going crazy today because the binaries are stripped in solver even when I use --disable-strip-solver. Sigh. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#39643: Remove --disable-strip-solver configure option
On 04/23/2012 06:17 PM, Petr Mladek wrote: I am not sure but I think that strip reduces size of binaries even when you build without -g. It just removes something less important. strip removes the table of internal symbols. The effect is that backtrace information (whether produced by LO's unmaintained automatic crash reporting or manually by a capable user) becomes hard to use (or even next to useless). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#39643: Remove --disable-strip-solver configure option
Stephan Bergmann píše v Út 24. 04. 2012 v 09:00 +0200: On 04/23/2012 06:17 PM, Petr Mladek wrote: I am not sure but I think that strip reduces size of binaries even when you build without -g. It just removes something less important. strip removes the table of internal symbols. The effect is that backtrace information (whether produced by LO's unmaintained automatic crash reporting or manually by a capable user) becomes hard to use (or even next to useless). OK, it would make sense to keep that table. I wonder how it increases the size of the installation set and if we could afford it for the release builds. BTW: Is it the same on Windows and MAC? I have zero experience with stripping binaries there. Best Regards, Petr PS: I am sorry but I do not have time to play with it before I do the tag for 3.5.3-rc2. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#39643: Remove --disable-strip-solver configure option
On Tuesday 24 of April 2012, Stephan Bergmann wrote: On 04/23/2012 06:17 PM, Petr Mladek wrote: I am not sure but I think that strip reduces size of binaries even when you build without -g. It just removes something less important. strip removes the table of internal symbols. The effect is that backtrace information (whether produced by LO's unmaintained automatic crash reporting or manually by a capable user) becomes hard to use (or even next to useless). I remember that used to be the case a looong time ago, but is it still valid today? Assuming this is about means such as the backtrace() call, that is AFAIK next to useless for normal builds anyway, as it just does not work with features like hidden visibility. I think debug info is the only usable way to get backtraces on Linux these days. Morever, if I pick e.g. libswlo.so from my devel build and strip it, the only difference is .debug* sections removed, so quite possibly even that table of internal symbols is a thing of the past. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#39643: Remove --disable-strip-solver configure option
Zitat von Lubos Lunak l.lu...@suse.cz: On Tuesday 24 of April 2012, Stephan Bergmann wrote: On 04/23/2012 06:17 PM, Petr Mladek wrote: I am not sure but I think that strip reduces size of binaries even when you build without -g. It just removes something less important. strip removes the table of internal symbols. The effect is that backtrace information (whether produced by LO's unmaintained automatic crash reporting or manually by a capable user) becomes hard to use (or even next to useless). I remember that used to be the case a looong time ago, but is it still valid today? Assuming this is about means such as the backtrace() call, that is AFAIK next to useless for normal builds anyway, as it just does not work with features like hidden visibility. I think debug info is the only usable way to get backtraces on Linux these days. Morever, if I pick e.g. libswlo.so from my devel build and strip it, the only difference is .debug* sections removed, so quite possibly even that table of internal symbols is a thing of the past. Do we agree about to drop the striping code from ooinstaller? As far as I can see the use cases we have are: Use Case (UC) 1: distro maintainer would build without -g, nothing to be stripped. UC 2: developer with change, compile, test cycle would build with -g and install LO with make install oder make dev-install. He wants definitely preserve the symbols. UC 3: developer compiles it with symbols and want provide the build artifacts to somebody to test. It could be the only justification to provide a new make target strip-and-install. But the tests with stripped artifacts are useless, no deeper analysis is possible. Another argument for not to strip even in this case is a new configure option that was introduced in the last hackfest to selectively specify the list of libraries to build with symbols. With this option not the whole LO but only a couple of libs would be built with symbols. If I've not forgotten some use cases, I would suggest to completely remove the whole stripping stuff from ooinstaller code. David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#39643: Remove --disable-strip-solver configure option
Hi David,
thanks a lot for looking at it. Your patch is almost perfect. Well,
there are still some open questions, see below. :-)
David Ostrovsky píše v So 21. 04. 2012 v 14:23 +0200:
Hi,
here is the patch to remove strip solver configure option.
Some places still has a strip code, for example in solenv/bin/deliver.pl
sub initialize_strip {
if ((!defined $ENV{CROSS_COMPILING}) || ($ENV{CROSS_COMPILING} ne
'YES')) {
$strip .= 'guw ' if ($^O eq 'cygwin');
[...]
was not sure if it is still needed.
Please, remove strip from deliver.pl. Otherwise, the binaries will be
always stripped. We need non-stripped binaries when producing debuginfo
packages on Linux.
Hmm, we might want to keep the strip stuff and the -dontstrip options in
the in the perl installer. It is handy when you have debug build and you
need to send someone the small stripped build. It is a big difference in
the size. I am not sure if make install should strip by default or
not. Bjoern, Lubos, what do you think?
Best Regards,
Petr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#39643: Remove --disable-strip-solver configure option
On Monday 23 of April 2012, Petr Mladek wrote: Hmm, we might want to keep the strip stuff and the -dontstrip options in the in the perl installer. It is handy when you have debug build and you need to send someone the small stripped build. It is a big difference in the size. I am not sure if make install should strip by default or not. Bjoern, Lubos, what do you think? It should not, it should do what the name says. If the functionality is deemed useful, it can be an extra target like other build systems have (e.g. automake has install-strip). -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#39643: Remove --disable-strip-solver configure option
On Mon, Apr 23, 2012 at 01:37:29PM +0200, Lubos Lunak wrote: On Monday 23 of April 2012, Petr Mladek wrote: Hmm, we might want to keep the strip stuff and the -dontstrip options in the in the perl installer. It is handy when you have debug build and you need to send someone the small stripped build. It is a big difference in the size. I am not sure if make install should strip by default or not. Bjoern, Lubos, what do you think? It should not, it should do what the name says. If the functionality is deemed useful, it can be an extra target like other build systems have (e.g. automake has install-strip). Sounds good to me. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#39643: Remove --disable-strip-solver configure option
Lubos Lunak píše v Po 23. 04. 2012 v 13:37 +0200: On Monday 23 of April 2012, Petr Mladek wrote: Hmm, we might want to keep the strip stuff and the -dontstrip options in the in the perl installer. It is handy when you have debug build and you need to send someone the small stripped build. It is a big difference in the size. I am not sure if make install should strip by default or not. Bjoern, Lubos, what do you think? It should not, it should do what the name says. If the functionality is deemed useful, it can be an extra target like other build systems have (e.g. automake has install-strip). Hmm, it is a bit more complicated. The installation sets, for the upstream release, are generated during normal build. make install is called only by developers or Linux distro packagers. I am not sure but I think that strip reduces size of binaries even when you build without -g. It just removes something less important. I am not sure what is the win but we might want to always strip binaries for the official installation sets to optimize download size for normal users. David, could you please do some investigation here? I wonder what is the difference when you build without debugging symbols and when you strip or non-strip the final binaries in the installation set. If you do tests on linux. You might want to use --enable-epm --with-package-format=rpm deb and compare the generated tar.gz in instsetoo_native/unxlng?6.pro/LibreOffice/*/install/*_download Make sure that you do not strip in solver: + remove strip in deliver.pl + remove strip in the gbuild makefiles Also you need to be capable to strip in the perl installer + use or not use -dontstrip when calling make_installer.pl in instsetoo_native/util/makefile.mk Best Regards, Petr PS: Your original patch actually forgot to update instsetoo_native/util/makefile.mk :-) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#39643: Remove --disable-strip-solver configure option
Hi,
here is the patch to remove strip solver configure option.
Some places still has a strip code, for example in solenv/bin/deliver.pl
sub initialize_strip {
if ((!defined $ENV{CROSS_COMPILING}) || ($ENV{CROSS_COMPILING} ne
'YES')) {
$strip .= 'guw ' if ($^O eq 'cygwin');
[...]
was not sure if it is still needed.
Note: I've tested make dev-install only on Linux.
Ciao
David
From ee90882e30d4ef9c60ea81018286cbfc8b07b566 Mon Sep 17 00:00:00 2001
From: David Ostrovsky david.ostrov...@gmx.de
Date: Wed, 18 Apr 2012 22:31:41 +0200
Subject: [PATCH] fdo#39643: Remove --disable-strip-solver configure option
---
config_host.mk.in |1 -
configure.in | 30 -
solenv/bin/deliver.pl |3 +-
solenv/bin/make_installer.pl | 28 -
solenv/bin/modules/installer/environment.pm |1 -
solenv/bin/modules/installer/globals.pm |2 -
solenv/bin/modules/installer/parameter.pm |5 -
solenv/bin/modules/installer/simplepackage.pm |4 -
solenv/bin/modules/installer/strip.pm | 144 --
solenv/bin/modules/installer/windows/strip.pm | 158 -
solenv/bin/ooinstall |6 -
solenv/gbuild/gbuild.mk |6 -
solenv/gbuild/platform/solaris.mk |6 -
solenv/gbuild/platform/unxgcc.mk |6 -
14 files changed, 1 insertions(+), 399 deletions(-)
delete mode 100644 solenv/bin/modules/installer/strip.pm
delete mode 100644 solenv/bin/modules/installer/windows/strip.pm
diff --git a/config_host.mk.in b/config_host.mk.in
index fe5fc87..651bdc4 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -89,7 +89,6 @@ export DISABLE_SCRIPTING=@DISABLE_SCRIPTING@
export DISABLE_LINKOO=@DISABLE_LINKOO@
export DISABLE_NEON=@DISABLE_NEON@
export DISABLE_PYTHON=@DISABLE_PYTHON@
-export DISABLE_STRIP=@DISABLE_STRIP@
export DLLTOOL=@DLLTOOL@
export DMAKEROOT=@SRC_ROOT@/solenv/inc/startup
export DOCDIR=@DOCDIR@
diff --git a/configure.in b/configure.in
index 4f981fc..1f1be80 100644
--- a/configure.in
+++ b/configure.in
@@ -611,19 +611,6 @@ AC_ARG_ENABLE(symbols,
AS_HELP_STRING([--enable-symbols],
[Include debugging symbols in output. WARNING - a complete build needs
8 Gb of space and takes much longer (enables -g compiler flag).])
-[
- Enabling symbols disables the stripping of the solver
- (--disable-strip-solver).
-],
-,)
-
-AC_ARG_ENABLE(strip-solver,
-AS_HELP_STRING([--disable-strip-solver],
-[Disable the stripping of the solver. By default the solver is stripped
- unless a build with debugging symbols (--enable-symbols) is requested.])
-[
- This switch allows to override this setting.
-],
,)
AC_ARG_ENABLE(werror,
@@ -3483,23 +3470,6 @@ else
fi
AC_SUBST(ENABLE_SYMBOLS)
-dnl Determine if the solver is to be stripped or not.
-dnl ===
-AC_MSG_CHECKING([whether to strip the solver or not.])
-if test $enable_strip_solver = no; then
-DISABLE_STRIP=TRUE
-AC_MSG_RESULT([no])
-else
-if test -n $ENABLE_SYMBOLS; then
-DISABLE_STRIP=TRUE
-AC_MSG_RESULT([no])
-else
-DISABLE_STRIP=
-AC_MSG_RESULT([yes])
-fi
-fi
-AC_SUBST(DISABLE_STRIP)
-
if test $enable_headless = yes; then
# be sure to do not mess with uneeded stuff
test_randr=no
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index c524ce5..7a97446 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -673,8 +673,7 @@ sub is_unstripped {
}
sub initialize_strip {
-if (((!defined $ENV{CROSS_COMPILING}) || ($ENV{CROSS_COMPILING} ne 'YES'))
-((!defined $ENV{DISABLE_STRIP}) || ($ENV{DISABLE_STRIP} eq ))) {
+if ((!defined $ENV{CROSS_COMPILING}) || ($ENV{CROSS_COMPILING} ne 'YES')) {
$strip .= 'guw ' if ($^O eq 'cygwin');
$strip .= 'strip';
$strip .= -x if ($ENV{OS} eq 'MACOSX');
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index baf4b08..2cc423c 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -58,7 +58,6 @@ use installer::scpzipfiles;
use installer::scriptitems;
use installer::setupscript;
use installer::simplepackage;
-use installer::strip qw(strip_libraries);
use installer::substfilenamefiles;
use installer::systemactions;
use installer::windows::assembly;
@@ -82,7 +81,6 @@ use installer::windows::removefile;
use installer::windows::registry;
use installer::windows::selfreg;
use installer::windows::shortcut;
-use installer::windows::strip;
use installer::windows::update;
use installer::windows::upgrade;
use installer::worker;
@@ -1227,19 +1225,6 @@ for ( my $n = 0; $n = $#installer::globals::languageproducts; $n
