From ecb179aecdc2e0846aa6bebb0cb8368e0e898eec Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 19 Mar 2013 04:53:15 +0100 Subject: [PATCH] vim: cross build support (x11 and gvim subpkgs not built for now). --- srcpkgs/vim/template | 47 +++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template index f0159092ea..37ed5f6b97 100644 --- a/srcpkgs/vim/template +++ b/srcpkgs/vim/template @@ -15,33 +15,52 @@ license="GPL-2" nofetch=yes noextract=yes +if [ -n "$XBPS_CROSS_BUILD" ]; then + # XXX x11 and gvim subpkgs. + subpackages="vim-common" + makedepends="mercurial pkg-config" + crossmakedepends="ncurses-devel acl-devel" +fi + do_fetch() { local url="http://code.google.com/p/vim/" hg clone -u v7-3-${_patchver} ${url} ${pkgname}-${version} } pre_configure() { - mkdir -p /tmp/vim-x11 - cp -a $wrksrc/* /tmp/vim-x11 - mv /tmp/vim-x11 $wrksrc/ - mkdir -p /tmp/gvim - cp -a $wrksrc/* /tmp/gvim - mv /tmp/gvim $wrksrc/gvim + if [ -z "$XBPS_CROSS_BUILD" ]; then + mkdir -p /tmp/vim-x11 + cp -a $wrksrc/* /tmp/vim-x11 + mv /tmp/vim-x11 $wrksrc/ + mkdir -p /tmp/gvim + cp -a $wrksrc/* /tmp/gvim + mv /tmp/gvim $wrksrc/gvim + fi } do_configure() { - local sharedargs="--disable-perlinterp --disable-pythoninterp \ - --disable-rubyinterp --disable-cscope --disable-workshop \ - --disable-netbeans --disable-sniff --disable-gpm \ - --disable-hangulinput --disable-xim --enable-multibyte \ - --with-tlib=ncursesw --with-ex-name=vim-ex \ + local sharedargs="--disable-perlinterp --disable-pythoninterp + --disable-rubyinterp --disable-cscope --disable-workshop + --disable-netbeans --disable-sniff --disable-gpm + --disable-hangulinput --disable-xim --enable-multibyte + --with-tlib=ncursesw --with-ex-name=vim-ex --with-view-name=vim-view" + if [ -n "$XBPS_CROSS_BUILD" ]; then + crossargs="vim_cv_toupper_broken=no vim_cv_terminfo=yes + vim_cv_tty_group=world vim_cv_getcwd_broken=no + vim_cv_stat_ignores_slash=yes + vim_cv_memmove_handles_overlap=yes" + sharedargs="${sharedargs} ${crossargs}" + fi + # Normal version. cd $wrksrc ./configure ${CONFIGURE_SHARED_ARGS} ${sharedargs} \ --enable-gui=no --with-x=no + [ -n "$XBPS_CROSS_BUILD" ] && return 0 + # X11 version. cd $wrksrc/vim-x11 ./configure ${CONFIGURE_SHARED_ARGS} ${sharedargs} \ @@ -54,9 +73,13 @@ do_configure() { } do_build() { - for f in "" vim-x11 gvim; do + cd $wrksrc && make ${makejobs} + [ -n "$XBPS_CROSS_BUILD" ] && return 0 + + for f in vim-x11 gvim; do cd $wrksrc/$f && make ${makejobs} done + } do_install() {