From 2bc68c32cb52ae30b31caf921ef38f9fee9aa4ac Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Sat, 12 Apr 2014 20:14:09 +0100 Subject: vim: Upgrade to v7.4.258 The patch against configure.in was resubmitted to the vim mailing list and was merged into the upstream sources so is no longer needed. Signed-off-by: Paul Barker Signed-off-by: Martin Jansa --- .../vim/files/configure.in_remove_CC_quotes.patch | 17 ----- meta-oe/recipes-support/vim/vim_7.4.155.bb | 79 ---------------------- meta-oe/recipes-support/vim/vim_7.4.258.bb | 78 +++++++++++++++++++++ 3 files changed, 78 insertions(+), 96 deletions(-) delete mode 100644 meta-oe/recipes-support/vim/files/configure.in_remove_CC_quotes.patch delete mode 100644 meta-oe/recipes-support/vim/vim_7.4.155.bb create mode 100644 meta-oe/recipes-support/vim/vim_7.4.258.bb (limited to 'meta-oe/recipes-support/vim') diff --git a/meta-oe/recipes-support/vim/files/configure.in_remove_CC_quotes.patch b/meta-oe/recipes-support/vim/files/configure.in_remove_CC_quotes.patch deleted file mode 100644 index c8cfe8ee0d..0000000000 --- a/meta-oe/recipes-support/vim/files/configure.in_remove_CC_quotes.patch +++ /dev/null @@ -1,17 +0,0 @@ -upstream: http://groups.google.com/group/vim_dev/browse_thread/thread/5685c3b859e3c793# -status: reported upstream ---- vim72-orig/src/configure.in 2010-09-29 19:13:33.000000000 +0200 -+++ vim72/src/configure.in 2010-09-29 19:17:07.000000000 +0200 -@@ -35,10 +35,10 @@ - fi - if test "$GCC" = yes; then - dnl method that should work for nearly all versions -- gccversion=`"$CC" -dumpversion` -+ gccversion=`$CC -dumpversion` - if test "x$gccversion" = "x"; then - dnl old method; fall-back for when -dumpversion doesn't work -- gccversion=`"$CC" --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[[^0-9]]*\([[0-9]]\.[[0-9.]]*\).*$/\1/g'` -+ gccversion=`$CC --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[[^0-9]]*\([[0-9]]\.[[0-9.]]*\).*$/\1/g'` - fi - dnl version 4.0.1 was reported to cause trouble on Macintosh by Marcin Dalecki - if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then diff --git a/meta-oe/recipes-support/vim/vim_7.4.155.bb b/meta-oe/recipes-support/vim/vim_7.4.155.bb deleted file mode 100644 index 0d98e7a1f9..0000000000 --- a/meta-oe/recipes-support/vim/vim_7.4.155.bb +++ /dev/null @@ -1,79 +0,0 @@ -SUMMARY = "Vi IMproved - enhanced vi editor" -SECTION = "console/utils" -DEPENDS = "ncurses" -# vimdiff doesn't like busybox diff -RSUGGESTS_${PN} = "diffutils" -LICENSE = "vim" -LIC_FILES_CHKSUM = "file://../runtime/doc/uganda.txt;md5=b779e18be6ed77facc770691c967b8f8" - -SRC_URI = "hg://vim.googlecode.com/hg/;protocol=https;module=vim \ - file://configure.in_remove_CC_quotes.patch;patchdir=.." -SRCREV = "v7-4-155" - -S = "${WORKDIR}/${PN}/src" - -VIMDIR = "${PN}${@d.getVar('PV',1).split('.')[0]}${@d.getVar('PV',1).split('.')[1]}" - -inherit autotools update-alternatives - -# vim configure.in contains functions which got 'dropped' by autotools.bbclass -do_configure () { - rm -f auto/* - touch auto/config.mk - aclocal - autoconf - oe_runconf - touch auto/configure - touch auto/config.mk auto/config.h -} - -#Available PACKAGECONFIG options are gtkgui, acl, x11, tiny -PACKAGECONFIG ??= "" - -PACKAGECONFIG[gtkgui] = "--enable-gtk2-test --enable-gui=gtk2,--enable-gui=no,gtk+," -PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," -PACKAGECONFIG[x11] = "--with-x,--without-x,xt," -PACKAGECONFIG[tiny] = "--with-features=tiny,--with-features=big,," - -EXTRA_OECONF = " \ - --disable-gpm \ - --disable-gtktest \ - --disable-xim \ - --disable-netbeans \ - --with-tlib=ncurses \ - ac_cv_small_wchar_t=no \ - vim_cv_getcwd_broken=no \ - vim_cv_memmove_handles_overlap=yes \ - vim_cv_stat_ignores_slash=no \ - vim_cv_terminfo=yes \ - vim_cv_tgent=non-zero \ - vim_cv_toupper_broken=no \ - vim_cv_tty_group=world \ - STRIP=/bin/true \ -" - -do_install_append() { - # Work around rpm picking up csh or awk as a dep - chmod -x ${D}${datadir}/${PN}/${VIMDIR}/tools/vim132 - chmod -x ${D}${datadir}/${PN}/${VIMDIR}/tools/mve.awk - - # Install example vimrc from runtime files - install -m 0644 ../runtime/vimrc_example.vim ${D}/${datadir}/${PN}/vimrc -} - -PARALLEL_MAKEINST = "" - -PACKAGES =+ "${PN}-common ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-data" -FILES_${PN}-syntax = "${datadir}/${PN}/${VIMDIR}/syntax" -FILES_${PN}-help = "${datadir}/${PN}/${VIMDIR}/doc" -FILES_${PN}-tutor = "${datadir}/${PN}/${VIMDIR}/tutor ${bindir}/${PN}tutor" -FILES_${PN}-vimrc = "${datadir}/${PN}/vimrc" -FILES_${PN}-data = "${datadir}/${PN}" - -# Recommend that runtime data is installed along with vim -RRECOMMENDS_${PN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-data" - -ALTERNATIVE_${PN} = "vi" -ALTERNATIVE_TARGET[vi] = "${bindir}/${PN}" -ALTERNATIVE_LINK_NAME[vi] = "${base_bindir}/vi" -ALTERNATIVE_PRIORITY[vi] = "100" diff --git a/meta-oe/recipes-support/vim/vim_7.4.258.bb b/meta-oe/recipes-support/vim/vim_7.4.258.bb new file mode 100644 index 0000000000..878c79e74f --- /dev/null +++ b/meta-oe/recipes-support/vim/vim_7.4.258.bb @@ -0,0 +1,78 @@ +SUMMARY = "Vi IMproved - enhanced vi editor" +SECTION = "console/utils" +DEPENDS = "ncurses" +# vimdiff doesn't like busybox diff +RSUGGESTS_${PN} = "diffutils" +LICENSE = "vim" +LIC_FILES_CHKSUM = "file://../runtime/doc/uganda.txt;md5=b779e18be6ed77facc770691c967b8f8" + +SRC_URI = "hg://vim.googlecode.com/hg/;protocol=https;module=vim" +SRCREV = "v7-4-258" + +S = "${WORKDIR}/${PN}/src" + +VIMDIR = "${PN}${@d.getVar('PV',1).split('.')[0]}${@d.getVar('PV',1).split('.')[1]}" + +inherit autotools update-alternatives + +# vim configure.in contains functions which got 'dropped' by autotools.bbclass +do_configure () { + rm -f auto/* + touch auto/config.mk + aclocal + autoconf + oe_runconf + touch auto/configure + touch auto/config.mk auto/config.h +} + +#Available PACKAGECONFIG options are gtkgui, acl, x11, tiny +PACKAGECONFIG ??= "" + +PACKAGECONFIG[gtkgui] = "--enable-gtk2-test --enable-gui=gtk2,--enable-gui=no,gtk+," +PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," +PACKAGECONFIG[x11] = "--with-x,--without-x,xt," +PACKAGECONFIG[tiny] = "--with-features=tiny,--with-features=big,," + +EXTRA_OECONF = " \ + --disable-gpm \ + --disable-gtktest \ + --disable-xim \ + --disable-netbeans \ + --with-tlib=ncurses \ + ac_cv_small_wchar_t=no \ + vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=no \ + vim_cv_terminfo=yes \ + vim_cv_tgent=non-zero \ + vim_cv_toupper_broken=no \ + vim_cv_tty_group=world \ + STRIP=/bin/true \ +" + +do_install_append() { + # Work around rpm picking up csh or awk as a dep + chmod -x ${D}${datadir}/${PN}/${VIMDIR}/tools/vim132 + chmod -x ${D}${datadir}/${PN}/${VIMDIR}/tools/mve.awk + + # Install example vimrc from runtime files + install -m 0644 ../runtime/vimrc_example.vim ${D}/${datadir}/${PN}/vimrc +} + +PARALLEL_MAKEINST = "" + +PACKAGES =+ "${PN}-common ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-data" +FILES_${PN}-syntax = "${datadir}/${PN}/${VIMDIR}/syntax" +FILES_${PN}-help = "${datadir}/${PN}/${VIMDIR}/doc" +FILES_${PN}-tutor = "${datadir}/${PN}/${VIMDIR}/tutor ${bindir}/${PN}tutor" +FILES_${PN}-vimrc = "${datadir}/${PN}/vimrc" +FILES_${PN}-data = "${datadir}/${PN}" + +# Recommend that runtime data is installed along with vim +RRECOMMENDS_${PN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-data" + +ALTERNATIVE_${PN} = "vi" +ALTERNATIVE_TARGET[vi] = "${bindir}/${PN}" +ALTERNATIVE_LINK_NAME[vi] = "${base_bindir}/vi" +ALTERNATIVE_PRIORITY[vi] = "100" -- cgit 1.2.3-korg