components/llvm/patches/034-solaris-clang-LLVM-python-perl-utils.patch
changeset 6512 92717ce71105
equal deleted inserted replaced
6511:d283aa33e131 6512:92717ce71105
       
     1 # 24311726 clang's Perl and Python utilities should not use #!/usr/bin/env
       
     2 # We have our own rules about calling perl or python from a script.
       
     3 # Not for upstream because they have their own rules about the same.
       
     4 --- tools/clang/tools/clang-format/clang-format-diff.py	2015-10-07 09:00:20.000000000 -0800
       
     5 +++ tools/clang/tools/clang-format/clang-format-diff.py	2016-07-06 15:23:00.886765925 -0800
       
     6 @@ -1,4 +1,4 @@
       
     7 -#!/usr/bin/env python
       
     8 +#!/usr/bin/python2.7
       
     9  #
       
    10  #===- clang-format-diff.py - ClangFormat Diff Reformatter ----*- python -*--===#
       
    11  #
       
    12 ###
       
    13 --- utils/llvm-lit/llvm-lit.in	2015-02-13 23:11:25.000000000 -0800
       
    14 +++ utils/llvm-lit/llvm-lit.in	2016-07-06 09:00:13.026877050 -0800
       
    15 @@ -1,4 +1,4 @@
       
    16 -#!/usr/bin/env python
       
    17 +#!/usr/bin/python2.7
       
    18  
       
    19  import os
       
    20  import sys
       
    21 ###
       
    22 --- tools/clang/tools/scan-view/bin/scan-view	2015-12-21 03:19:13.000000000 -0900
       
    23 +++ tools/clang/tools/scan-view/bin/scan-view	2016-07-06 06:56:42.737952300 -0800
       
    24 @@ -1,4 +1,4 @@
       
    25 -#!/usr/bin/env python
       
    26 +#!/usr/bin/python2.7
       
    27  
       
    28  """The clang static analyzer results viewer.
       
    29  """
       
    30 ###
       
    31 --- tools/clang/tools/scan-build/bin/scan-build	2015-11-13 12:34:15.000000000 -0800
       
    32 +++ tools/clang/tools/scan-build/bin/scan-build	2016-07-17 21:12:44.529864065 -0700
       
    33 @@ -1,4 +1,4 @@
       
    34 -#!/usr/bin/env perl
       
    35 +#!/usr/bin/perl
       
    36  #
       
    37  #                     The LLVM Compiler Infrastructure
       
    38  #
       
    39 @@ -1739,19 +1739,19 @@
       
    40  
       
    41  # Determine the location of ccc-analyzer.
       
    42  my $AbsRealBin = Cwd::realpath($RealBin);
       
    43 -my $Cmd = "$AbsRealBin/../libexec/ccc-analyzer";
       
    44 -my $CmdCXX = "$AbsRealBin/../libexec/c++-analyzer";
       
    45 +my $Cmd = "$AbsRealBin/../lib/ccc-analyzer";
       
    46 +my $CmdCXX = "$AbsRealBin/../lib/c++-analyzer";
       
    47  
       
    48  # Portability: use less strict but portable check -e (file exists) instead of
       
    49  # non-portable -x (file is executable). On some windows ports -x just checks
       
    50  # file extension to determine if a file is executable (see Perl language
       
    51  # reference, perlport)
       
    52  if (!defined $Cmd || ! -e $Cmd) {
       
    53 -  $Cmd = "$AbsRealBin/ccc-analyzer";
       
    54 +  $Cmd = "$AbsRealBin/../lib/ccc-analyzer";
       
    55    DieDiag("'ccc-analyzer' does not exist at '$Cmd'\n") if(! -e $Cmd);
       
    56  }
       
    57  if (!defined $CmdCXX || ! -e $CmdCXX) {
       
    58 -  $CmdCXX = "$AbsRealBin/c++-analyzer";
       
    59 +  $CmdCXX = "$AbsRealBin/../lib/c++-analyzer";
       
    60    DieDiag("'c++-analyzer' does not exist at '$CmdCXX'\n") if(! -e $CmdCXX);
       
    61  }
       
    62  
       
    63 ###
       
    64 --- tools/clang/tools/clang-format/git-clang-format	2015-06-19 00:23:10.000000000 -0800
       
    65 +++ tools/clang/tools/clang-format/git-clang-format	2016-07-06 07:00:51.876140590 -0800
       
    66 @@ -1,4 +1,4 @@
       
    67 -#!/usr/bin/env python
       
    68 +#!/usr/bin/python2.7
       
    69  #
       
    70  #===- git-clang-format - ClangFormat Git Integration ---------*- python -*--===#
       
    71  #
       
    72 ###
       
    73 --- tools/clang/tools/scan-build/libexec/ccc-analyzer	2015-11-13 11:34:15.000000000 -0900
       
    74 +++ tools/clang/tools/scan-build/libexec/ccc-analyzer	2016-07-06 15:30:08.133853080 -0800
       
    75 @@ -1,4 +1,4 @@
       
    76 -#!/usr/bin/env perl
       
    77 +#!/usr/bin/perl
       
    78  #
       
    79  #                     The LLVM Compiler Infrastructure
       
    80  #
       
    81 ###
       
    82 --- tools/clang/tools/scan-build/libexec/c++-analyzer	2015-11-13 11:34:15.000000000 -0900
       
    83 +++ tools/clang/tools/scan-build/libexec/c++-analyzer	2016-07-06 15:29:59.431752970 -0800
       
    84 @@ -1,4 +1,4 @@
       
    85 -#!/usr/bin/env perl
       
    86 +#!/usr/bin/perl
       
    87  
       
    88  use Cwd qw/ abs_path /;
       
    89  use File::Basename qw/ dirname /;