mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
vim: split the common part into vim.inc
Previously vim-tiny would include the vim recipe wholesale; this meant that they had to be upgraded in a single transaction which devtool cannot cope with. This thwarted the latest AUH run in particular. (From OE-Core rev: 55cc8c6dbef8de240f63e7274a2beaf421124b58) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
3b06404e30
commit
6d401d808a
@@ -1,4 +1,4 @@
|
||||
require vim_${PV}.bb
|
||||
require vim.inc
|
||||
|
||||
SUMMARY += " (with tiny features)"
|
||||
|
||||
|
||||
@@ -0,0 +1,141 @@
|
||||
SUMMARY = "Vi IMproved - enhanced vi editor"
|
||||
SECTION = "console/utils"
|
||||
|
||||
PROVIDES = "xxd"
|
||||
DEPENDS = "ncurses gettext-native"
|
||||
# vimdiff doesn't like busybox diff
|
||||
RSUGGESTS_${PN} = "diffutils"
|
||||
LICENSE = "vim"
|
||||
LIC_FILES_CHKSUM = "file://runtime/doc/uganda.txt;endline=287;md5=f1f82b42360005c70b8c19b0ef493f72"
|
||||
|
||||
SRC_URI = "git://github.com/vim/vim.git \
|
||||
file://disable_acl_header_check.patch \
|
||||
file://vim-add-knob-whether-elf.h-are-checked.patch \
|
||||
file://0001-src-Makefile-improve-reproducibility.patch \
|
||||
"
|
||||
SRCREV = "d96dbd6f95ea22f609042cc9c6272f14a21ff1a5"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
VIMDIR = "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}"
|
||||
|
||||
inherit autotools-brokensep update-alternatives
|
||||
|
||||
CLEANBROKEN = "1"
|
||||
|
||||
# vim configure.in contains functions which got 'dropped' by autotools.bbclass
|
||||
do_configure () {
|
||||
cd src
|
||||
rm -f auto/*
|
||||
touch auto/config.mk
|
||||
aclocal
|
||||
autoconf
|
||||
cd ..
|
||||
oe_runconf
|
||||
touch src/auto/configure
|
||||
touch src/auto/config.mk src/auto/config.h
|
||||
}
|
||||
|
||||
do_compile() {
|
||||
# We do not support fully / correctly the following locales. Attempting
|
||||
# to use these with msgfmt in order to update the ".desktop" files exposes
|
||||
# this problem and leads to the compile failing.
|
||||
for LOCALE in cs fr ko pl sk zh_CN zh_TW;do
|
||||
echo -n > src/po/${LOCALE}.po
|
||||
done
|
||||
autotools_do_compile
|
||||
}
|
||||
|
||||
#Available PACKAGECONFIG options are gtkgui, acl, x11, tiny
|
||||
PACKAGECONFIG ??= ""
|
||||
PACKAGECONFIG += " \
|
||||
${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtkgui', '', d)} \
|
||||
"
|
||||
PACKAGECONFIG_class-native = ""
|
||||
|
||||
PACKAGECONFIG[gtkgui] = "--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,,"
|
||||
PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,"
|
||||
PACKAGECONFIG[elfutils] = "--enable-elf-check,,elfutils,"
|
||||
|
||||
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_tgetent=non-zero \
|
||||
vim_cv_toupper_broken=no \
|
||||
vim_cv_tty_group=world \
|
||||
STRIP=/bin/true \
|
||||
"
|
||||
|
||||
do_install() {
|
||||
autotools_do_install
|
||||
|
||||
# Work around file-rdeps picking up csh, awk, perl or python as a dep
|
||||
chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/vim132
|
||||
chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/mve.awk
|
||||
chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.pl
|
||||
chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.py
|
||||
|
||||
# Install example vimrc from runtime files
|
||||
install -m 0644 runtime/vimrc_example.vim ${D}/${datadir}/${BPN}/vimrc
|
||||
|
||||
# we use --with-features=big as default
|
||||
mv ${D}${bindir}/${BPN} ${D}${bindir}/${BPN}.${BPN}
|
||||
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'true', 'false', d)}; then
|
||||
# The mouse being autoenabled is just annoying in xfce4-terminal (mouse
|
||||
# drag make vim go into visual mode and there is no right click menu),
|
||||
# delete the block.
|
||||
sed -i '/the mouse works just fine/,+4d' ${D}/${datadir}/${BPN}/vimrc
|
||||
fi
|
||||
}
|
||||
|
||||
PARALLEL_MAKEINST = ""
|
||||
|
||||
PACKAGES =+ "${PN}-common ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-tools"
|
||||
FILES_${PN}-syntax = "${datadir}/${BPN}/${VIMDIR}/syntax"
|
||||
FILES_${PN}-help = "${datadir}/${BPN}/${VIMDIR}/doc"
|
||||
FILES_${PN}-tutor = "${datadir}/${BPN}/${VIMDIR}/tutor ${bindir}/${BPN}tutor"
|
||||
FILES_${PN}-vimrc = "${datadir}/${BPN}/vimrc"
|
||||
FILES_${PN}-data = "${datadir}/${BPN}"
|
||||
FILES_${PN}-tools = "${datadir}/${BPN}/${VIMDIR}/tools"
|
||||
FILES_${PN}-common = " \
|
||||
${datadir}/${BPN}/${VIMDIR}/*.vim \
|
||||
${datadir}/${BPN}/${VIMDIR}/autoload \
|
||||
${datadir}/${BPN}/${VIMDIR}/colors \
|
||||
${datadir}/${BPN}/${VIMDIR}/compiler \
|
||||
${datadir}/${BPN}/${VIMDIR}/ftplugin \
|
||||
${datadir}/${BPN}/${VIMDIR}/indent \
|
||||
${datadir}/${BPN}/${VIMDIR}/keymap \
|
||||
${datadir}/${BPN}/${VIMDIR}/lang \
|
||||
${datadir}/${BPN}/${VIMDIR}/macros \
|
||||
${datadir}/${BPN}/${VIMDIR}/plugin \
|
||||
${datadir}/${BPN}/${VIMDIR}/print \
|
||||
${datadir}/${BPN}/${VIMDIR}/spell \
|
||||
${datadir}/icons \
|
||||
"
|
||||
|
||||
RDEPENDS_${BPN} = "ncurses-terminfo-base"
|
||||
# Recommend that runtime data is installed along with vim
|
||||
RRECOMMENDS_${BPN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-common"
|
||||
|
||||
ALTERNATIVE_${PN} = "vi vim xxd"
|
||||
ALTERNATIVE_PRIORITY = "100"
|
||||
ALTERNATIVE_TARGET = "${bindir}/${BPN}.${BPN}"
|
||||
ALTERNATIVE_LINK_NAME[vi] = "${base_bindir}/vi"
|
||||
ALTERNATIVE_LINK_NAME[vim] = "${bindir}/vim"
|
||||
ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"
|
||||
ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
@@ -1,141 +1 @@
|
||||
SUMMARY = "Vi IMproved - enhanced vi editor"
|
||||
SECTION = "console/utils"
|
||||
|
||||
PROVIDES = "xxd"
|
||||
DEPENDS = "ncurses gettext-native"
|
||||
# vimdiff doesn't like busybox diff
|
||||
RSUGGESTS_${PN} = "diffutils"
|
||||
LICENSE = "vim"
|
||||
LIC_FILES_CHKSUM = "file://runtime/doc/uganda.txt;endline=287;md5=f1f82b42360005c70b8c19b0ef493f72"
|
||||
|
||||
SRC_URI = "git://github.com/vim/vim.git \
|
||||
file://disable_acl_header_check.patch \
|
||||
file://vim-add-knob-whether-elf.h-are-checked.patch \
|
||||
file://0001-src-Makefile-improve-reproducibility.patch \
|
||||
"
|
||||
SRCREV = "d96dbd6f95ea22f609042cc9c6272f14a21ff1a5"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
VIMDIR = "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}"
|
||||
|
||||
inherit autotools-brokensep update-alternatives
|
||||
|
||||
CLEANBROKEN = "1"
|
||||
|
||||
# vim configure.in contains functions which got 'dropped' by autotools.bbclass
|
||||
do_configure () {
|
||||
cd src
|
||||
rm -f auto/*
|
||||
touch auto/config.mk
|
||||
aclocal
|
||||
autoconf
|
||||
cd ..
|
||||
oe_runconf
|
||||
touch src/auto/configure
|
||||
touch src/auto/config.mk src/auto/config.h
|
||||
}
|
||||
|
||||
do_compile() {
|
||||
# We do not support fully / correctly the following locales. Attempting
|
||||
# to use these with msgfmt in order to update the ".desktop" files exposes
|
||||
# this problem and leads to the compile failing.
|
||||
for LOCALE in cs fr ko pl sk zh_CN zh_TW;do
|
||||
echo -n > src/po/${LOCALE}.po
|
||||
done
|
||||
autotools_do_compile
|
||||
}
|
||||
|
||||
#Available PACKAGECONFIG options are gtkgui, acl, x11, tiny
|
||||
PACKAGECONFIG ??= ""
|
||||
PACKAGECONFIG += " \
|
||||
${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtkgui', '', d)} \
|
||||
"
|
||||
PACKAGECONFIG_class-native = ""
|
||||
|
||||
PACKAGECONFIG[gtkgui] = "--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,,"
|
||||
PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,"
|
||||
PACKAGECONFIG[elfutils] = "--enable-elf-check,,elfutils,"
|
||||
|
||||
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_tgetent=non-zero \
|
||||
vim_cv_toupper_broken=no \
|
||||
vim_cv_tty_group=world \
|
||||
STRIP=/bin/true \
|
||||
"
|
||||
|
||||
do_install() {
|
||||
autotools_do_install
|
||||
|
||||
# Work around file-rdeps picking up csh, awk, perl or python as a dep
|
||||
chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/vim132
|
||||
chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/mve.awk
|
||||
chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.pl
|
||||
chmod -x ${D}${datadir}/${BPN}/${VIMDIR}/tools/*.py
|
||||
|
||||
# Install example vimrc from runtime files
|
||||
install -m 0644 runtime/vimrc_example.vim ${D}/${datadir}/${BPN}/vimrc
|
||||
|
||||
# we use --with-features=big as default
|
||||
mv ${D}${bindir}/${BPN} ${D}${bindir}/${BPN}.${BPN}
|
||||
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'true', 'false', d)}; then
|
||||
# The mouse being autoenabled is just annoying in xfce4-terminal (mouse
|
||||
# drag make vim go into visual mode and there is no right click menu),
|
||||
# delete the block.
|
||||
sed -i '/the mouse works just fine/,+4d' ${D}/${datadir}/${BPN}/vimrc
|
||||
fi
|
||||
}
|
||||
|
||||
PARALLEL_MAKEINST = ""
|
||||
|
||||
PACKAGES =+ "${PN}-common ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-tools"
|
||||
FILES_${PN}-syntax = "${datadir}/${BPN}/${VIMDIR}/syntax"
|
||||
FILES_${PN}-help = "${datadir}/${BPN}/${VIMDIR}/doc"
|
||||
FILES_${PN}-tutor = "${datadir}/${BPN}/${VIMDIR}/tutor ${bindir}/${BPN}tutor"
|
||||
FILES_${PN}-vimrc = "${datadir}/${BPN}/vimrc"
|
||||
FILES_${PN}-data = "${datadir}/${BPN}"
|
||||
FILES_${PN}-tools = "${datadir}/${BPN}/${VIMDIR}/tools"
|
||||
FILES_${PN}-common = " \
|
||||
${datadir}/${BPN}/${VIMDIR}/*.vim \
|
||||
${datadir}/${BPN}/${VIMDIR}/autoload \
|
||||
${datadir}/${BPN}/${VIMDIR}/colors \
|
||||
${datadir}/${BPN}/${VIMDIR}/compiler \
|
||||
${datadir}/${BPN}/${VIMDIR}/ftplugin \
|
||||
${datadir}/${BPN}/${VIMDIR}/indent \
|
||||
${datadir}/${BPN}/${VIMDIR}/keymap \
|
||||
${datadir}/${BPN}/${VIMDIR}/lang \
|
||||
${datadir}/${BPN}/${VIMDIR}/macros \
|
||||
${datadir}/${BPN}/${VIMDIR}/plugin \
|
||||
${datadir}/${BPN}/${VIMDIR}/print \
|
||||
${datadir}/${BPN}/${VIMDIR}/spell \
|
||||
${datadir}/icons \
|
||||
"
|
||||
|
||||
RDEPENDS_${BPN} = "ncurses-terminfo-base"
|
||||
# Recommend that runtime data is installed along with vim
|
||||
RRECOMMENDS_${BPN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-common"
|
||||
|
||||
ALTERNATIVE_${PN} = "vi vim xxd"
|
||||
ALTERNATIVE_PRIORITY = "100"
|
||||
ALTERNATIVE_TARGET = "${bindir}/${BPN}.${BPN}"
|
||||
ALTERNATIVE_LINK_NAME[vi] = "${base_bindir}/vi"
|
||||
ALTERNATIVE_LINK_NAME[vim] = "${bindir}/vim"
|
||||
ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"
|
||||
ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
require vim.inc
|
||||
|
||||
Reference in New Issue
Block a user