Ignore:
Timestamp:
Oct 6, 2013, 10:03:17 PM (6 years ago)
Author:
raimue@…
Message:

editors/vim, editors/vim-app:
Fix use of the wrong compiler after applying patches to the configure script.

Location:
trunk/dports/editors
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/editors/vim-app/Portfile

    r111960 r111963  
    126126autoconf.dir ${worksrcpath}/src
    127127
     128post-patch {
     129    set features [open ${worksrcpath}/src/feature.h a+]
     130    puts $features "#define SYS_VIMRC_FILE \"${prefix}/etc/vimrc\""
     131    close $features
     132
     133    # Ensure that auto/config.mk is never older than auto/configure.
     134    # If the latter was modified by a patch, it would trigger a rebuild of
     135    # auto/config.mk with the wrong environment resulting in the use of the
     136    # wrong compiler.
     137    file mtime ${worksrcpath}/src/auto/config.mk [clock seconds]
     138}
     139
    128140configure.pre_args  --prefix=${applications_dir}
    129141configure.args      --enable-gui=carbon \
     
    139151    system "tar xvfz ${distpath}/app-bm.tar.gz -C ${workpath}"
    140152    system "tar xvfz ${distpath}/doc.tar.gz -C ${workpath}"
    141 }
    142 
    143 post-patch {
    144         set features [open ${worksrcpath}/src/feature.h a+]
    145         puts $features "#define SYS_VIMRC_FILE \"${prefix}/etc/vimrc\""
    146         close $features
    147153}
    148154
  • trunk/dports/editors/vim/Portfile

    r111960 r111963  
    104104autoconf.dir ${worksrcpath}/src
    105105
     106post-patch {
     107    set features [open ${worksrcpath}/src/feature.h a+]
     108    puts $features "#define SYS_VIMRC_FILE \"${prefix}/etc/vimrc\""
     109    close $features
     110
     111    # Ensure that auto/config.mk is never older than auto/configure.
     112    # If the latter was modified by a patch, it would trigger a rebuild of
     113    # auto/config.mk with the wrong environment resulting in the use of the
     114    # wrong compiler.
     115    file mtime ${worksrcpath}/src/auto/config.mk [clock seconds]
     116}
     117
    106118configure.args      --disable-gui \
    107119                    --without-x \
     
    112124                    --with-developer-dir=${developer_dir}
    113125
    114 post-patch {
    115     set features [open ${worksrcpath}/src/feature.h a+]
    116     puts $features "#define SYS_VIMRC_FILE \"${prefix}/etc/vimrc\""
    117     close $features
    118 }
    119 
    120126post-destroot {
    121127    ln -s ${prefix}/bin/vim ${destroot}${prefix}/bin/vi
Note: See TracChangeset for help on using the changeset viewer.