[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

[Ariel Constenla-Haile]

 solenv/bin/modules/installer/control.pm |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 3ad9bb02f84c05964f73ffe08495c3140ac2151e
Author: Ariel Constenla-Haile <arielch at apache.org>
Date:   Sat Jun 8 01:46:14 2013 +0000

    Fix build breaker
    
    The log file is checked for the word "error" at the end of the packaging
    process, this breaks the build when the word is part of a file name,
    like boost error.hpp/error.ipp headers.

diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 3648aff..bad8c98 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -347,6 +347,9 @@ sub check_logfile
         $compareline =~ s/Error\.ulf//g;    # removing all occurences of "Error.ulf"
         $compareline =~ s/Error\.idl//g;    # removing all occurences of "Error.idl"
         $compareline =~ s/Error\.html//g;   # removing all occurences of "Error.html"
+        # Ugly workaround for (boost) headers
+        $compareline =~ s/error\.hpp//g;    # removing all occurences of "error.hpp"
+        $compareline =~ s/error\.ipp//g;    # removing all occurences of "error.ipp"
 
         if ( $compareline =~ /\bError\b/i )
         {