Ticket #723: 0001-config-Fix-ICU-detection-for-ICU-4.2.patch

File 0001-config-Fix-ICU-detection-for-ICU-4.2.patch, 1.1 KB (added by ingmar, 5 years ago)
  • config/auto/icu.pm

    From 154e168623fce783558abf18ab28ab543dc5049e Mon Sep 17 00:00:00 2001
    From: Ingmar Vanhassel <ingmar@exherbo.org>
    Date: Sat, 30 May 2009 17:45:58 +0200
    Subject: [PATCH] [config] Fix ICU detection for ICU 4.2
    
    ICU 4.2's 'icu-config --prefix' outputs an extra newline, strip it.
    
    Otherwise this breaks as follows:
    
    icuheaders:  captured /usr
    
    Unsuccessful stat on filename containing newline at config/auto/icu.pm line 332.
    Unsuccessful stat on filename containing newline at config/auto/icu.pm line 337.
    For icuheaders, found /usr
    /include and 1
    ---
     config/auto/icu.pm |    1 +
     1 files changed, 1 insertions(+), 0 deletions(-)
    
    diff --git a/config/auto/icu.pm b/config/auto/icu.pm
    index f1afc84..b283f98 100644
    a b  
    299299        print "Trying $arg->{icuconfig} with '--prefix'\n" 
    300300            if $arg->{verbose}; 
    301301        $icuheaders = capture_output("$arg->{icuconfig} --prefix"); 
     302        chomp($icuheaders); 
    302303        print "icuheaders:  captured $icuheaders\n" 
    303304            if $arg->{verbose}; 
    304305        ($icuheaders, $arg->{without}) =