[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - bootstrap solenv/bin solenv/inc

[Fridrich Å trba]

 bootstrap                |    1 
 solenv/bin/gccinstlib.pl |   78 -----------------------------------------------
 solenv/inc/unitools.mk   |    1 
 3 files changed, 80 deletions(-)

New commits:
commit 930adff42e498ee4f8655cee09bcb2e43838413a
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Feb 19 11:31:17 2013 +0100

    No need to copy the gcc libraries anymore
    
    Change-Id: I6dbf44bb78f14ab71a48a9cd4e9ebba60bfc97d2
    (cherry picked from commit 8ff09509d725ce18814d5d77794f227d0c72037b)
    Reviewed-on: https://gerrit.libreoffice.org/2254
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/bootstrap b/bootstrap
index b7a7362..bbe941d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -76,7 +76,6 @@ fi
 
 chmod +x "$SRC_ROOT/solenv/bin/build.pl"
 chmod +x "$SRC_ROOT/solenv/bin/zipdep.pl"
-chmod +x "$SRC_ROOT/solenv/bin/gccinstlib.pl"
 
 # Local Variables:
 # mode: shell-script
diff --git a/solenv/bin/gccinstlib.pl b/solenv/bin/gccinstlib.pl
deleted file mode 100755
index 2deb4d4..0000000
--- a/solenv/bin/gccinstlib.pl
+++ /dev/null
@@ -1,78 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-   if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$ENV{'LC_MESSAGES'} = 'C';
-
-$Dest = pop(@ARGV) || die "No destination to copy to";
-
-$cc = $ENV{'CC'} || die "No CC environment set";
-
-if ($Dest =~ /--help/ || @ARGV < 1) {
-    print "Syntax:\n  gcc-instlib <library-in-libpath ...> <destination-dir>\n";
-    exit (0);
-}
-
-%SrcAndDest = ();
-
-foreach $File (@ARGV) {
-    my $string;
-
-    my $NormFile = $File;
-    $NormFile =~ s/\.so\.\d+/.so/;
-    @search = ($File, $NormFile);
-
-    foreach $entry (@search) {
-        open (GCCOut, "LANGUAGE=C LC_ALL=C $cc -print-file-name=$entry|") ||
-            next;
-        $string=<GCCOut>;
-        chomp ($string);
-        close (GCCOut);
-        if (-e $string) {
-            $SrcAndDest{$string} = "$Dest/$File";
-            last;
-        }
-    }
-}
-
-while (($Src, $FullDest) = each %SrcAndDest) {
-    printf "copy $Src to $FullDest\n";
-    system ("/bin/cp $Src $FullDest") && die "copy failed: $!";
-}
-
-
-foreach $File (@ARGV) {
-    #https://bugzilla.redhat.com/show_bug.cgi?id=149465
-    printf "unprelinking $Dest/$File\n";
-    #If it's already unprelinked .i.e. no .gnu.prelink_undo section, that's fine
-    #If prelink is not installed, it's massively unlikely that it's prelinked
-    system ("prelink -u $Dest/$File > /dev/null 2>&1");
-}
-
-exit (0);
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index bbd51bf..24c8a7a 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -176,7 +176,6 @@ RM+=$(RMFLAGS)
 ADJUSTVISIBILITY*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/adjustvisibility
 CONVERT*:=$(PERL) $(SOLARENV)/bin/leconvert.pl
 EXECTEST := $(PERL) -w $(SOLARENV)/bin/exectest.pl
-GCCINSTLIB:=$(PERL) -w $(SOLARENV)/bin/gccinstlib.pl
 
 # The dmake $(PWD) apparantly produces paths with symlinks resolved, while the
 # bash pwd command by default produces paths with unresolved symlinks, so that