From 7be78a939bde5228a7f92a58ac08dd10901a8a4f Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Fri, 13 Sep 2013 20:08:22 +0000 Subject: vim: upgrade to v7.4.27 and refactor 'vim.inc' is merged into the new recipe 'vim_7.4.27.bb', the recipe is slightly reorganised and a minor omission in the comments is corrected. DESCRIPTION is replaced with SUMMARY. PR and INC_PR values are dropped. The variable PV_MAJOR is also dropped as it isn't used. LIC_FILES_CHECKSUM is updated as an address and version number given in the license have been modified. The main license text itself is unchanged. The setting of PARALLEL_MAKE to force single-threaded compilation is removed as there is no justification in the git history for this being needed and the compilation completes fine without it. Signed-off-by: Paul Barker Signed-off-by: Martin Jansa --- meta-oe/recipes-support/vim/vim.inc | 80 ----------------------------- meta-oe/recipes-support/vim/vim_7.3.1314.bb | 7 --- meta-oe/recipes-support/vim/vim_7.4.27.bb | 77 +++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 87 deletions(-) delete mode 100644 meta-oe/recipes-support/vim/vim.inc delete mode 100644 meta-oe/recipes-support/vim/vim_7.3.1314.bb create mode 100644 meta-oe/recipes-support/vim/vim_7.4.27.bb (limited to 'meta-oe/recipes-support/vim') diff --git a/meta-oe/recipes-support/vim/vim.inc b/meta-oe/recipes-support/vim/vim.inc deleted file mode 100644 index 991ba74f1..000000000 --- a/meta-oe/recipes-support/vim/vim.inc +++ /dev/null @@ -1,80 +0,0 @@ -DESCRIPTION = "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=4c91d841bb7b75f68b5bb8ad7118f5b8" - -PV_MAJOR = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" -VIMDIR = "${PN}${@d.getVar('PV',1).split('.')[0]}${@d.getVar('PV',1).split('.')[1]}" - -INC_PR = "r13" - -SRC_URI = "hg://vim.googlecode.com/hg/;protocol=https;module=vim" - -S = "${WORKDIR}/${PN}/src" - -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, 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 -} - -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" - -PARALLEL_MAKE = "" diff --git a/meta-oe/recipes-support/vim/vim_7.3.1314.bb b/meta-oe/recipes-support/vim/vim_7.3.1314.bb deleted file mode 100644 index 1be5a9102..000000000 --- a/meta-oe/recipes-support/vim/vim_7.3.1314.bb +++ /dev/null @@ -1,7 +0,0 @@ -require ${PN}.inc - -PR = "${INC_PR}.0" - -SRCREV = "v7-3-1314" - -SRC_URI += "file://configure.in_remove_CC_quotes.patch;patchdir=.." diff --git a/meta-oe/recipes-support/vim/vim_7.4.27.bb b/meta-oe/recipes-support/vim/vim_7.4.27.bb new file mode 100644 index 000000000..77507d4c5 --- /dev/null +++ b/meta-oe/recipes-support/vim/vim_7.4.27.bb @@ -0,0 +1,77 @@ +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-027" + +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 +} + +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 v1.2.3-54-g00ecf