Ticket #43839: clang-modernize.diff

File clang-modernize.diff, 9.5 KB (added by mamoll (Mark Moll), 10 years ago)

  • llvm-3.4/Portfile

     
    55
    66set llvm_version        3.4
    77set llvm_version_no_dot 34
    8 revision                2
     8revision                3
    99name                    llvm-${llvm_version}
    1010subport                 clang-${llvm_version} {}
    1111set suffix              mp-${llvm_version}
    … …  
    5656#
    5757#set compiler_rt_rev     ${svn.revision}
    5858#set libcxx_rev          ${svn.revision}
     59#set clang-modernize_rev ${svn.revision}
    5960#version                 ${llvm_version}-r${svn.revision}
    6061#worksrcdir              trunk
    6162#svn.url                 http://llvm.org/svn/llvm-project/llvm/trunk
    … …  
    7677            distfiles-append     polly-${version}.src${extract.suffix}
    7778        }
    7879    } elseif {${subport} == "clang-${llvm_version}"} {
    79         distfiles-append     clang-${version}.src${extract.suffix} compiler-rt-${version}.src${extract.suffix} libcxx-${version}.src${extract.suffix}
     80        distfiles-append     clang-${version}.src${extract.suffix} compiler-rt-${version}.src${extract.suffix} libcxx-${version}.src${extract.suffix} clang-tools-extra-${version}.src${extract.suffix}
    8081    }
    8182}
    8283
    … …  
    9495                    sha256  f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c \
    9596                    libcxx-3.4.src.tar.gz \
    9697                    rmd160  146a49dc0ae9635f87b13038d36ad816b7245666 \
    97                     sha256  bd9f200279f0eb19fc28ed2d9d607dfd38e2e7d92bf52e7fb2161f89212e0deb
     98                    sha256  bd9f200279f0eb19fc28ed2d9d607dfd38e2e7d92bf52e7fb2161f89212e0deb \
     99                    clang-tools-extra-3.4.src.tar.gz \
     100                    rmd160  8af0af0ead94bd50b1e6cbdcde5c4770bba5de0d \
     101                    sha256  ba85187551ae97fe1c8ab569903beae5ff0900e21233e5eb5389f6ceab1028b4
    98102
    99103patchfiles      install_target.patch \
    100104                tiger-shlib.patch
    … …  
    105109    patchfiles-append    tiger-shlib-clang.patch tiger-libclang.patch scan-build-PR-35006.patch \
    106110                         0001-Comment-out-SL-cctools-workaround.patch \
    107111                         clang-format.patch \
     112                         clang-modernize.patch \
    108113                         snowleopard-cmath.patch
    109114
    110115    build.target        clang-only
    … …  
    210215            system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/trunk clang"
    211216            system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/trunk compiler-rt"
    212217            system "cd ${worksrcpath}/projects && svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/trunk libcxx"
     218            system "cd ${worksrcpath}/tools/clang/tools && svn co -r ${clang-modernize_rev} http://llvm.org/svn/llvm-project/clang-tools-extra/trunk extra"
    213219        } elseif {${worksrcdir} == "release_${llvm_version_no_dot}" } {
    214220            system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/branches/release_${llvm_version_no_dot} clang"
    215221            system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/branches/release_${llvm_version_no_dot} compiler-rt"
    216222            system "cd ${worksrcpath}/projects && svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/branches/release_${llvm_version_no_dot} libcxx"
     223            system "cd ${worksrcpath}/tools/clang/tools && svn co -r ${clang-modernize_rev} http://llvm.org/svn/llvm-project/clang-tools-extra/branches/release_${llvm_version_no_dot} extra"
    217224        } else {
    218225            file rename ${workpath}/clang-${llvm_version} ${worksrcpath}/tools/clang
    219226            file rename ${workpath}/compiler-rt-${llvm_version} ${worksrcpath}/projects/compiler-rt
    220227            file rename ${workpath}/libcxx-${llvm_version} ${worksrcpath}/projects/libcxx
     228            file rename ${workpath}/clang-tools-extra-${llvm_version} ${worksrcpath}/tools/clang/tools/extra
    221229        }
    222230    }
    223231}

  • llvm-3.4/files/clang-modernize.patch

     
     1--- a/Makefile  2014-05-29 08:40:41.000000000 -0500
     2+++ b/Makefile  2014-05-29 08:41:52.000000000 -0500
     3@@ -72,7 +72,9 @@
     4           tools/clang/tools/c-index-test \
     5           tools/clang/runtime tools/clang/docs \
     6           tools/clang/include tools/clang/lib \
     7-          tools/clang/tools/clang-format
     8+          tools/clang/tools/clang-format \
     9+          tools/clang/tools/extra/clang-modernize \
     10+          tools/clang/tools/extra/clang-apply-replacements
     11   OPTIONAL_DIRS :=
     12   NO_INSTALL = 1
     13 endif

  • llvm-3.4/files/mp-clang-3.4

     
    22bin/clang++-mp-3.4
    33bin/clang-mp-3.4
    44bin/clang-format-mp-3.4
    5 -
     5bin/clang-modernize-mp-3.4
    66bin/scan-build-mp-3.4
    77bin/scan-view-mp-3.4

  • llvm-3.5/Portfile

     
    66
    77set llvm_version        3.5
    88set llvm_version_no_dot 35
    9 revision                1
     9revision                2
    1010name                    llvm-${llvm_version}
    1111subport                 clang-${llvm_version} {}
    1212set suffix              mp-${llvm_version}
    … …  
    5757
    5858set compiler_rt_rev     ${svn.revision}
    5959set libcxx_rev          ${svn.revision}
     60set clang-modernize_rev ${svn.revision}
    6061version                 ${llvm_version}-r${svn.revision}
    6162worksrcdir              trunk
    6263svn.url                 http://llvm.org/svn/llvm-project/llvm/trunk
    … …  
    7778            distfiles-append     polly-${version}.src${extract.suffix}
    7879        }
    7980    } elseif {${subport} == "clang-${llvm_version}"} {
    80         distfiles-append     clang-${version}.src${extract.suffix} compiler-rt-${version}.src${extract.suffix} libcxx-${version}.src${extract.suffix}
     81        distfiles-append     clang-${version}.src${extract.suffix} compiler-rt-${version}.src${extract.suffix} libcxx-${version}.src${extract.suffix} clang-tools-extra-${version}.src${extract.suffix}
    8182    }
    8283}
    8384
    … …  
    8990    patchfiles-append    scan-build-PR-35006.patch \
    9091                         0001-Comment-out-SL-cctools-workaround.patch \
    9192                         clang-format.patch \
     93                         clang-modernize.patch \
    9294                         snowleopard-cmath.patch
    9395
    9496    build.target        clang-only
    … …  
    214216            system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/trunk clang"
    215217            system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/trunk compiler-rt"
    216218            system "cd ${worksrcpath}/projects && svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/trunk libcxx"
     219            system "cd ${worksrcpath}/tools/clang/tools && svn co -r ${clang-modernize_rev} http://llvm.org/svn/llvm-project/clang-tools-extra/trunk extra"
    217220        } elseif {${worksrcdir} == "release_${llvm_version_no_dot}" } {
    218221            system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/branches/release_${llvm_version_no_dot} clang"
    219222            system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/branches/release_${llvm_version_no_dot} compiler-rt"
    220223            system "cd ${worksrcpath}/projects && svn co -r ${libcxx_rev} http://llvm.org/svn/llvm-project/libcxx/branches/release_${llvm_version_no_dot} libcxx"
     224            system "cd ${worksrcpath}/tools/clang/tools && svn co -r ${clang-modernize_rev} http://llvm.org/svn/llvm-project/clang-tools-extra/branches/release_${llvm_version_no_dot} extra"
    221225        } else {
    222226            file rename ${workpath}/clang-${llvm_version} ${worksrcpath}/tools/clang
    223227            file rename ${workpath}/compiler-rt-${llvm_version} ${worksrcpath}/projects/compiler-rt
    224228            file rename ${workpath}/libcxx-${llvm_version} ${worksrcpath}/projects/libcxx
     229            file rename ${workpath}/clang-tools-extra-${llvm_version} ${worksrcpath}/tools/clang/tools/extra
    225230        }
    226231    }
    227232}

  • llvm-3.5/files/clang-modernize.patch

     
     1--- a/Makefile  2014-05-29 08:40:41.000000000 -0500
     2+++ b/Makefile  2014-05-29 08:41:52.000000000 -0500
     3@@ -72,7 +72,9 @@
     4           tools/clang/tools/c-index-test \
     5           tools/clang/runtime tools/clang/docs \
     6           tools/clang/include tools/clang/lib \
     7-          tools/clang/tools/clang-format
     8+          tools/clang/tools/clang-format \
     9+          tools/clang/tools/extra/clang-modernize \
     10+          tools/clang/tools/extra/clang-apply-replacements
     11   OPTIONAL_DIRS :=
     12   NO_INSTALL = 1
     13 endif

  • llvm-3.5/files/mp-clang-3.5

     
    22bin/clang++-mp-3.5
    33bin/clang-mp-3.5
    44bin/clang-format-mp-3.5
    5 -
     5bin/clang-modernize-mp-3.5
    66bin/scan-build-mp-3.5
    77bin/scan-view-mp-3.5