[PATCH 0/3] vim: add dependency and selinux and acl support control

[PATCH 0/3] vim: add dependency and selinux and acl support control

[Chong Lu]

These patches based on "vim: Upgrade to v7.4.258"

The following changes since commit 91a4267823a6c3abf2eb5aa14549328e8868b7f5:

  vim: Upgrade to v7.4.258 (2014-04-18 18:00:28 +0800)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib chonglu/vim
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=chonglu/vim

Chong Lu (3):
  vim: add dependency and selinux and acl support control
  vim: don't check acl header if acl support disabled
  vim: add knob whether elf.h are checked

 .../vim/files/disable_acl_header_check.patch       | 27 +++++++++++++++
 .../vim-add-knob-whether-elf.h-are-checked.patch   | 38 ++++++++++++++++++++++
 meta-oe/recipes-support/vim/vim_7.4.258.bb         | 26 +++++++++++++--
 3 files changed, 89 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-support/vim/files/disable_acl_header_check.patch
 create mode 100644 meta-oe/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch

-- 
1.8.1.2

[PATCH 1/3] vim: add dependency and selinux and acl support control

[Chong Lu]

1. Add explicit selinux and acl support control.
2. Vim depends on gettext-native, add to the dependency list.
3. Split binary file into vim package and put others in vim-common.

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
 meta-oe/recipes-support/vim/vim_7.4.258.bb | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/vim/vim_7.4.258.bb b/meta-oe/recipes-support/vim/vim_7.4.258.bb
index 878c79e..023e8fc 100644
--- a/meta-oe/recipes-support/vim/vim_7.4.258.bb
+++ b/meta-oe/recipes-support/vim/vim_7.4.258.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Vi IMproved - enhanced vi editor"
 SECTION = "console/utils"
-DEPENDS = "ncurses"
+DEPENDS = "ncurses gettext-native"
 # vimdiff doesn't like busybox diff
 RSUGGESTS_${PN} = "diffutils"
 LICENSE = "vim"
@@ -28,11 +28,14 @@ do_configure () {
 
 #Available PACKAGECONFIG options are gtkgui, acl, x11, tiny
 PACKAGECONFIG ??= ""
+PACKAGECONFIG += "${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}"
+PACKAGECONFIG += "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}"
 
 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,,"
+PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,"
 
 EXTRA_OECONF = " \
     --disable-gpm \
@@ -68,6 +71,21 @@ 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}"
+FILES_${PN}-common = " \
+    ${datadir}/${PN}/${VIMDIR}/*.vim \
+    ${datadir}/${PN}/${VIMDIR}/autoload \
+    ${datadir}/${PN}/${VIMDIR}/colors \
+    ${datadir}/${PN}/${VIMDIR}/compiler \
+    ${datadir}/${PN}/${VIMDIR}/ftplugin \
+    ${datadir}/${PN}/${VIMDIR}/indent \
+    ${datadir}/${PN}/${VIMDIR}/keymap \
+    ${datadir}/${PN}/${VIMDIR}/lang \
+    ${datadir}/${PN}/${VIMDIR}/macros \
+    ${datadir}/${PN}/${VIMDIR}/plugin \
+    ${datadir}/${PN}/${VIMDIR}/print \
+    ${datadir}/${PN}/${VIMDIR}/spell \
+    ${datadir}/${PN}/${VIMDIR}/tools \
+"
 
 # Recommend that runtime data is installed along with vim
 RRECOMMENDS_${PN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-data"
-- 
1.8.1.2

Re: [PATCH 1/3] vim: add dependency and selinux and acl support control

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2969 bytes --]

On Fri, Apr 18, 2014 at 06:16:30PM +0800, Chong Lu wrote:
> 1. Add explicit selinux and acl support control.
> 2. Vim depends on gettext-native, add to the dependency list.
> 3. Split binary file into vim package and put others in vim-common.

All 3 merged, thanks!

> 
> Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
> ---
>  meta-oe/recipes-support/vim/vim_7.4.258.bb | 20 +++++++++++++++++++-
>  1 file changed, 19 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-oe/recipes-support/vim/vim_7.4.258.bb b/meta-oe/recipes-support/vim/vim_7.4.258.bb
> index 878c79e..023e8fc 100644
> --- a/meta-oe/recipes-support/vim/vim_7.4.258.bb
> +++ b/meta-oe/recipes-support/vim/vim_7.4.258.bb
> @@ -1,6 +1,6 @@
>  SUMMARY = "Vi IMproved - enhanced vi editor"
>  SECTION = "console/utils"
> -DEPENDS = "ncurses"
> +DEPENDS = "ncurses gettext-native"
>  # vimdiff doesn't like busybox diff
>  RSUGGESTS_${PN} = "diffutils"
>  LICENSE = "vim"
> @@ -28,11 +28,14 @@ do_configure () {
>  
>  #Available PACKAGECONFIG options are gtkgui, acl, x11, tiny
>  PACKAGECONFIG ??= ""
> +PACKAGECONFIG += "${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}"
> +PACKAGECONFIG += "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}"
>  
>  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,,"
> +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,"
>  
>  EXTRA_OECONF = " \
>      --disable-gpm \
> @@ -68,6 +71,21 @@ 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}"
> +FILES_${PN}-common = " \
> +    ${datadir}/${PN}/${VIMDIR}/*.vim \
> +    ${datadir}/${PN}/${VIMDIR}/autoload \
> +    ${datadir}/${PN}/${VIMDIR}/colors \
> +    ${datadir}/${PN}/${VIMDIR}/compiler \
> +    ${datadir}/${PN}/${VIMDIR}/ftplugin \
> +    ${datadir}/${PN}/${VIMDIR}/indent \
> +    ${datadir}/${PN}/${VIMDIR}/keymap \
> +    ${datadir}/${PN}/${VIMDIR}/lang \
> +    ${datadir}/${PN}/${VIMDIR}/macros \
> +    ${datadir}/${PN}/${VIMDIR}/plugin \
> +    ${datadir}/${PN}/${VIMDIR}/print \
> +    ${datadir}/${PN}/${VIMDIR}/spell \
> +    ${datadir}/${PN}/${VIMDIR}/tools \
> +"
>  
>  # Recommend that runtime data is installed along with vim
>  RRECOMMENDS_${PN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-data"
> -- 
> 1.8.1.2
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 1/3] vim: add dependency and selinux and acl support control

[Paul Barker]

[-- Attachment #1: Type: text/plain, Size: 1805 bytes --]

On Fri, Apr 18, 2014 at 06:16:30PM +0800, Chong Lu wrote:
>  FILES_${PN}-data = "${datadir}/${PN}"
> +FILES_${PN}-common = " \
> +    ${datadir}/${PN}/${VIMDIR}/*.vim \
> +    ${datadir}/${PN}/${VIMDIR}/autoload \
> +    ${datadir}/${PN}/${VIMDIR}/colors \
> +    ${datadir}/${PN}/${VIMDIR}/compiler \
> +    ${datadir}/${PN}/${VIMDIR}/ftplugin \
> +    ${datadir}/${PN}/${VIMDIR}/indent \
> +    ${datadir}/${PN}/${VIMDIR}/keymap \
> +    ${datadir}/${PN}/${VIMDIR}/lang \
> +    ${datadir}/${PN}/${VIMDIR}/macros \
> +    ${datadir}/${PN}/${VIMDIR}/plugin \
> +    ${datadir}/${PN}/${VIMDIR}/print \
> +    ${datadir}/${PN}/${VIMDIR}/spell \
> +    ${datadir}/${PN}/${VIMDIR}/tools \
> +"
>  
>  # Recommend that runtime data is installed along with vim
>  RRECOMMENDS_${PN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-data"

Sorry to reply to an old commit but this has broke things for me. Installing vim
after this commit gives:

    vim: unsatisfied recommendation for vim-data

As everything that was in vim-data is now in vim-common. Your commit message
says "Split binary file into vim package and put others in vim-common.", but
this split was already in effect with everything in vim-data. It then got
installed by default as vim-data is in RRECOMMENDS_vim, but could be disabled by
adding things to BAD_RECOMMENDS.

What is the benefit of moving things to vim-common? I'm probably just
misunderstanding what this change is aiming to solve.

As vim-data is now left empty, can we remove it from PACKAGES and
RRECOMMENDS_vim and instead add vim-common to RRECOMMENDS_vim? Just want to make
sure that won't break anything for you before I send a patch.

Thanks,

-- 
Paul Barker

Email: paul@paulbarker.me.uk
http://www.paulbarker.me.uk

[-- Attachment #2: Type: application/pgp-signature, Size: 501 bytes --]

Re: [PATCH 1/3] vim: add dependency and selinux and acl support control

[Chong Lu]

On 05/06/2014 05:45 AM, Paul Barker wrote:
> On Fri, Apr 18, 2014 at 06:16:30PM +0800, Chong Lu wrote:
>>   FILES_${PN}-data = "${datadir}/${PN}"
>> +FILES_${PN}-common = " \
>> +    ${datadir}/${PN}/${VIMDIR}/*.vim \
>> +    ${datadir}/${PN}/${VIMDIR}/autoload \
>> +    ${datadir}/${PN}/${VIMDIR}/colors \
>> +    ${datadir}/${PN}/${VIMDIR}/compiler \
>> +    ${datadir}/${PN}/${VIMDIR}/ftplugin \
>> +    ${datadir}/${PN}/${VIMDIR}/indent \
>> +    ${datadir}/${PN}/${VIMDIR}/keymap \
>> +    ${datadir}/${PN}/${VIMDIR}/lang \
>> +    ${datadir}/${PN}/${VIMDIR}/macros \
>> +    ${datadir}/${PN}/${VIMDIR}/plugin \
>> +    ${datadir}/${PN}/${VIMDIR}/print \
>> +    ${datadir}/${PN}/${VIMDIR}/spell \
>> +    ${datadir}/${PN}/${VIMDIR}/tools \
>> +"
>>   
>>   # Recommend that runtime data is installed along with vim
>>   RRECOMMENDS_${PN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-data"
> Sorry to reply to an old commit but this has broke things for me. Installing vim
> after this commit gives:
>
>      vim: unsatisfied recommendation for vim-data
>
> As everything that was in vim-data is now in vim-common. Your commit message
> says "Split binary file into vim package and put others in vim-common.", but
> this split was already in effect with everything in vim-data. It then got
> installed by default as vim-data is in RRECOMMENDS_vim, but could be disabled by
> adding things to BAD_RECOMMENDS.
>
> What is the benefit of moving things to vim-common? I'm probably just
> misunderstanding what this change is aiming to solve.
I just refer to Ubuntu splitting package policy.***
<https://bbs.archlinux.org/viewtopic.php?id=173515>*
>
> As vim-data is now left empty, can we remove it from PACKAGES and
> RRECOMMENDS_vim and instead add vim-common to RRECOMMENDS_vim? Just want to make
> sure that won't break anything for you before I send a patch.
Sorry for my mistake. we should remove vim-data from PACKAGES and 
RRECOMMENDS_vim and
add vim-common to RRECOMMENDS_vim.
> Thanks,
>

Re: [PATCH 1/3] vim: add dependency and selinux and acl support control

[Paul Barker]

[-- Attachment #1: Type: text/plain, Size: 2346 bytes --]

On Tue, May 06, 2014 at 10:55:22AM +0800, Chong Lu wrote:
> 
> On 05/06/2014 05:45 AM, Paul Barker wrote:
> >On Fri, Apr 18, 2014 at 06:16:30PM +0800, Chong Lu wrote:
> >>  FILES_${PN}-data = "${datadir}/${PN}"
> >>+FILES_${PN}-common = " \
> >>+    ${datadir}/${PN}/${VIMDIR}/*.vim \
> >>+    ${datadir}/${PN}/${VIMDIR}/autoload \
> >>+    ${datadir}/${PN}/${VIMDIR}/colors \
> >>+    ${datadir}/${PN}/${VIMDIR}/compiler \
> >>+    ${datadir}/${PN}/${VIMDIR}/ftplugin \
> >>+    ${datadir}/${PN}/${VIMDIR}/indent \
> >>+    ${datadir}/${PN}/${VIMDIR}/keymap \
> >>+    ${datadir}/${PN}/${VIMDIR}/lang \
> >>+    ${datadir}/${PN}/${VIMDIR}/macros \
> >>+    ${datadir}/${PN}/${VIMDIR}/plugin \
> >>+    ${datadir}/${PN}/${VIMDIR}/print \
> >>+    ${datadir}/${PN}/${VIMDIR}/spell \
> >>+    ${datadir}/${PN}/${VIMDIR}/tools \
> >>+"
> >>  # Recommend that runtime data is installed along with vim
> >>  RRECOMMENDS_${PN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-data"
> >Sorry to reply to an old commit but this has broke things for me. Installing vim
> >after this commit gives:
> >
> >     vim: unsatisfied recommendation for vim-data
> >
> >As everything that was in vim-data is now in vim-common. Your commit message
> >says "Split binary file into vim package and put others in vim-common.", but
> >this split was already in effect with everything in vim-data. It then got
> >installed by default as vim-data is in RRECOMMENDS_vim, but could be disabled by
> >adding things to BAD_RECOMMENDS.
> >
> >What is the benefit of moving things to vim-common? I'm probably just
> >misunderstanding what this change is aiming to solve.
> I just refer to Ubuntu splitting package policy.***
> <https://bbs.archlinux.org/viewtopic.php?id=173515>*
> >
> >As vim-data is now left empty, can we remove it from PACKAGES and
> >RRECOMMENDS_vim and instead add vim-common to RRECOMMENDS_vim? Just want to make
> >sure that won't break anything for you before I send a patch.
> Sorry for my mistake. we should remove vim-data from PACKAGES and
> RRECOMMENDS_vim and
> add vim-common to RRECOMMENDS_vim.

No problem, it's an easy fix. I'll put together a patch later this week unless
you'd like to do it.

Thanks,

-- 
Paul Barker

Email: paul@paulbarker.me.uk
http://www.paulbarker.me.uk

[-- Attachment #2: Type: application/pgp-signature, Size: 501 bytes --]

Re: [PATCH 1/3] vim: add dependency and selinux and acl support control

[Chong Lu]

On 05/06/2014 05:45 AM, Paul Barker wrote:
> On Fri, Apr 18, 2014 at 06:16:30PM +0800, Chong Lu wrote:
>>   FILES_${PN}-data = "${datadir}/${PN}"
>> +FILES_${PN}-common = " \
>> +    ${datadir}/${PN}/${VIMDIR}/*.vim \
>> +    ${datadir}/${PN}/${VIMDIR}/autoload \
>> +    ${datadir}/${PN}/${VIMDIR}/colors \
>> +    ${datadir}/${PN}/${VIMDIR}/compiler \
>> +    ${datadir}/${PN}/${VIMDIR}/ftplugin \
>> +    ${datadir}/${PN}/${VIMDIR}/indent \
>> +    ${datadir}/${PN}/${VIMDIR}/keymap \
>> +    ${datadir}/${PN}/${VIMDIR}/lang \
>> +    ${datadir}/${PN}/${VIMDIR}/macros \
>> +    ${datadir}/${PN}/${VIMDIR}/plugin \
>> +    ${datadir}/${PN}/${VIMDIR}/print \
>> +    ${datadir}/${PN}/${VIMDIR}/spell \
>> +    ${datadir}/${PN}/${VIMDIR}/tools \
>> +"
>>   
>>   # Recommend that runtime data is installed along with vim
>>   RRECOMMENDS_${PN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-data"
> Sorry to reply to an old commit but this has broke things for me. Installing vim
> after this commit gives:
>
>      vim: unsatisfied recommendation for vim-data
>
> As everything that was in vim-data is now in vim-common. Your commit message
> says "Split binary file into vim package and put others in vim-common.", but
> this split was already in effect with everything in vim-data. It then got
> installed by default as vim-data is in RRECOMMENDS_vim, but could be disabled by
> adding things to BAD_RECOMMENDS.
>
> What is the benefit of moving things to vim-common? I'm probably just
> misunderstanding what this change is aiming to solve.
I just refer to Ubuntu splitting package policy.
> As vim-data is now left empty, can we remove it from PACKAGES and
> RRECOMMENDS_vim and instead add vim-common to RRECOMMENDS_vim? Just want to make
> sure that won't break anything for you before I send a patch.
Sorry for my mistake. We should remove vim-data from PACKAGES and 
RRECOMMENDS_vim and
add vim-common to RRECOMMENDS_vim.

Best Regards
Chong
>
> Thanks,
>

[PATCH 2/3] vim: don't check acl header if acl support disabled

[Chong Lu]

Vim/vim-tiny always check 'sys/acl.h' existence even acl support
has been disabled from configure line. This works in mostly time
but except for acl works in an odd mode - while acl was mirrored
from sstate_cache, it will install 'sys/acl.h' to sysroot dir and
and then clean the header file with sysroot_cleansstate().

If build vim/vim-tiny and acl in parallel, below errors will occur:

* os_unix.c:2668:23: fatal error: sys/acl.h: No such file or directory

This change only workaround the failure and get build running, we
still need to fix it from acl side.

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
 .../vim/files/disable_acl_header_check.patch       | 27 ++++++++++++++++++++++
 meta-oe/recipes-support/vim/vim_7.4.258.bb         |  4 +++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-support/vim/files/disable_acl_header_check.patch

diff --git a/meta-oe/recipes-support/vim/files/disable_acl_header_check.patch b/meta-oe/recipes-support/vim/files/disable_acl_header_check.patch
new file mode 100644
index 0000000..8f824e7
--- /dev/null
+++ b/meta-oe/recipes-support/vim/files/disable_acl_header_check.patch
@@ -0,0 +1,27 @@
+Upstream-Status: pending
+
+Don't check 'sys/acl.h' if acl support disabled for vim/vim-tiny.
+
+Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
+================================================
+diff --git a/src/configure.in b/src/configure.in
+index fb965e5..d734064 100644
+--- a/src/configure.in
++++ b/src/configure.in
+@@ -2511,7 +2511,7 @@ AC_CHECK_HEADERS(stdarg.h stdint.h stdlib.h string.h \
+ 	sys/systeminfo.h locale.h sys/stream.h termios.h \
+ 	libc.h sys/statfs.h poll.h sys/poll.h pwd.h \
+ 	utime.h sys/param.h libintl.h libgen.h \
+-	util/debug.h util/msg18n.h frame.h sys/acl.h \
++	util/debug.h util/msg18n.h frame.h \
+ 	sys/access.h sys/sysinfo.h wchar.h wctype.h)
+ 
+ dnl sys/ptem.h depends on sys/stream.h on Solaris
+@@ -3112,6 +3112,7 @@ AC_ARG_ENABLE(acl,
+ 	, [enable_acl="yes"])
+ if test "$enable_acl" = "yes"; then
+ AC_MSG_RESULT(no)
++AC_CHECK_HEADERS(sys/acl.h)
+ AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"],
+ 	AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl"
+ 		  AC_CHECK_LIB(attr, fgetxattr, LIBS="$LIBS -lattr",,)],,),)
diff --git a/meta-oe/recipes-support/vim/vim_7.4.258.bb b/meta-oe/recipes-support/vim/vim_7.4.258.bb
index 023e8fc..9c6e231 100644
--- a/meta-oe/recipes-support/vim/vim_7.4.258.bb
+++ b/meta-oe/recipes-support/vim/vim_7.4.258.bb
@@ -6,7 +6,9 @@ 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"
+SRC_URI = "hg://vim.googlecode.com/hg/;protocol=https;module=vim \
+           file://disable_acl_header_check.patch;patchdir=.. \
+"
 SRCREV = "v7-4-258"
 
 S = "${WORKDIR}/${PN}/src"
-- 
1.8.1.2

[PATCH 3/3] vim: add knob whether elf.h are checked

[Chong Lu]

Previously, it still was checked when there was no elf library in sysroots directory.
Add knob to decide whether elf.h are checked or not.

Fixed by using PACKAGECONFIG to check elf, with default disabled set.

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
 .../vim-add-knob-whether-elf.h-are-checked.patch   | 38 ++++++++++++++++++++++
 meta-oe/recipes-support/vim/vim_7.4.258.bb         |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 meta-oe/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch

diff --git a/meta-oe/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch b/meta-oe/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch
new file mode 100644
index 0000000..693d130
--- /dev/null
+++ b/meta-oe/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch
@@ -0,0 +1,38 @@
+vim: add knob whether elf.h are checked
+
+Previously, it still was checked when there was no elf library in sysroots directory.
+Add knob to decide whether elf.h are checked or not.
+
+Upstream-status: Pending
+
+Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
+---
+ src/configure.in |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/configure.in b/src/configure.in
+index d734064..f504fa6 100644
+--- a/src/configure.in
++++ b/src/configure.in
+@@ -2483,11 +2483,18 @@ AC_TRY_COMPILE([#include <stdio.h>], [int x __attribute__((unused));],
+ 	AC_MSG_RESULT(no))
+ 
+ dnl Checks for header files.
++AC_MSG_CHECKING(whether or not to look for elf.h)
++AC_ARG_ENABLE(elf-check,
++        [  --enable-elf-check      If elfutils, check for elf.h [default=no]],
++        , enable_elf_check="no")
++AC_MSG_RESULT($enable_elf_check)
++if test "x$enable_elf_check" != "xno"; then
+ AC_CHECK_HEADER(elf.h, HAS_ELF=1)
+ dnl AC_CHECK_HEADER(dwarf.h, SVR4=1)
+ if test "$HAS_ELF" = 1; then
+   AC_CHECK_LIB(elf, main)
+ fi
++fi
+ 
+ AC_HEADER_DIRENT
+ 
+-- 
+1.7.9.5
+
diff --git a/meta-oe/recipes-support/vim/vim_7.4.258.bb b/meta-oe/recipes-support/vim/vim_7.4.258.bb
index 9c6e231..19c8abc 100644
--- a/meta-oe/recipes-support/vim/vim_7.4.258.bb
+++ b/meta-oe/recipes-support/vim/vim_7.4.258.bb
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://../runtime/doc/uganda.txt;md5=b779e18be6ed77facc77069
 
 SRC_URI = "hg://vim.googlecode.com/hg/;protocol=https;module=vim \
            file://disable_acl_header_check.patch;patchdir=.. \
+           file://vim-add-knob-whether-elf.h-are-checked.patch;patchdir=.. \
 "
 SRCREV = "v7-4-258"
 
@@ -38,6 +39,7 @@ 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 \
-- 
1.8.1.2