Petr Mladek píše v Čt 26. 04. 2012 v 10:59 +0200:
> I am going to double check it in a clean build and push it within next 3
> hours or so.
It needed slightly more tweaking, see the attached patch.
1. I used "--strip" instead of "-strip" in ooinstall. There already was
"--help" and it was more typical in GNU tools.
2. ooinstall newer stripped because "$installer::globals::strip" was
forced to "0" when using "-simple" option. It is not longer necessary
because strip is disabled by default now.
3. I added one closing bracket by mistake during previous commit.
Everything works as expected now. "make install-strip" safes 80MB of
690MB on the installed system if do not use -g. It will be much more if
you compile with -g. So, the feature makes sense.
I have pushed it into master, see
http://cgit.freedesktop.org/libreoffice/core/commit/?id=65840941eeeab7021168a17797b6129ea15a722d
Thanks a lot for the patches. Great work!
Best Regards,
Petr
>From 3f8fe23de0902cccf5ec744f0c11f8d0f5a6b165 Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmla...@suse.cz>
Date: Thu, 26 Apr 2012 12:32:33 +0200
Subject: [PATCH] even more
---
Makefile | 4 ++--
solenv/bin/modules/installer/parameter.pm | 1 -
solenv/bin/ooinstall | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 8993256..2086fd9 100644
--- a/Makefile
+++ b/Makefile
@@ -440,8 +440,8 @@ install:
echo "$(INSTALLDIR)/program/soffice"
install-strip:
- echo "Installing in $(INSTALLDIR)..." && \
- ooinstall -strip "$(INSTALLDIR)" && \
+ echo "Installing and stripping binaries in $(INSTALLDIR)..." && \
+ ooinstall --strip "$(INSTALLDIR)" && \
echo "" && \
echo "Installation finished, you can now execute:" && \
echo "$(INSTALLDIR)/program/soffice"
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 21b2776..b7b7c3b 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -162,7 +162,6 @@ sub getparameter
$installer::globals::simple = 1;
$installer::globals::call_epm = 0;
$installer::globals::makedownload = 0;
- $installer::globals::strip = 0;
my $path = shift(@ARGV);
$path =~ s/^\Q$installer::globals::destdir\E//;
$installer::globals::rootpath = $path;
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 65b1949..bb4d077 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -42,7 +42,7 @@ if ( $ENV{'SYSTEM_MOZILLA'} eq 'YES' ) {
$ENV{'PYTHONPATH'} = "$ENV{'SRC_ROOT'}/instsetoo_native/$ENV{'INPATH'}/bin:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib/python:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib/python/lib-dynload";
for $arg (@ARGV) {
- if ($arg eq '-l' || $arg eq '--link') { {
+ if ($arg eq '-l' || $arg eq '--link') {
$do_link = 1;
} elsif ($arg eq '-s' || $arg eq '--strip') {
$strip = "-strip";
--
1.7.4.2
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
