From 9e6585cdccaadae74977657e1d633d84f1048c8d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 11 Mar 2014 16:06:28 +0100 Subject: [PATCH] vim: try to fix cross build and use configure_args for vim-huge too. --- srcpkgs/vim/template | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template index e04fcea3b6d..28283ada3cc 100644 --- a/srcpkgs/vim/template +++ b/srcpkgs/vim/template @@ -3,10 +3,10 @@ pkgname=vim _distver=7.4 _patchver=169 version=${_distver}.${_patchver} -revision=2 +revision=3 hostmakedepends="mercurial pkg-config" -makedepends=" - ncurses-devel acl-devel libXt-devel gtk+-devel desktop-file-utils hicolor-icon-theme ruby-devel python-devel lua-devel perl" +makedepends="ncurses-devel acl-devel libXt-devel gtk+-devel + desktop-file-utils hicolor-icon-theme ruby-devel python-devel lua-devel perl" depends="vim-common>=$version" short_desc="Vim editor (vi clone)" maintainer="Juan RP " @@ -31,7 +31,7 @@ pre_configure() { } do_configure() { - configure_args+=" --disable-perlinterp --disable-pythoninterp + args+=" --disable-perlinterp --disable-pythoninterp --disable-rubyinterp --disable-cscope --disable-workshop --disable-netbeans --disable-sniff --disable-gpm --disable-hangulinput --disable-xim --enable-multibyte @@ -48,19 +48,19 @@ do_configure() { # Normal version. cd $wrksrc - ./configure ${configure_args} --enable-gui=no --with-x=no + ./configure ${configure_args} ${args} --enable-gui=no --with-x=no # X11 version. cd $wrksrc/vim-x11 - ./configure ${configure_args} --enable-gui=no --with-x + ./configure ${configure_args} ${args} --enable-gui=no --with-x # GTK+ version. cd $wrksrc/gvim - ./configure ${configure_args} --enable-gui=gtk2 --with-x --with-vim-name=gvim + ./configure ${configure_args} ${args} --enable-gui=gtk2 --with-x --with-vim-name=gvim # Huge version. cd $wrksrc/vim-huge - ./configure --with-features=huge --with-x=no --enable-gui=no + ./configure ${configure_args} --with-features=huge --with-x=no --enable-gui=no } do_build() {