From a5cc93d8e3593ed055572a87d6c5a9c2e239b3d3 Mon Sep 17 00:00:00 2001 From: Chong Lu Date: Fri, 18 Apr 2014 18:16:32 +0800 Subject: 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. Fixed by using PACKAGECONFIG to check elf, with default disabled set. Signed-off-by: Chong Lu Signed-off-by: Martin Jansa --- .../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 (limited to 'meta-oe/recipes-support/vim') 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 0000000000..693d130e49 --- /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 +--- + 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 ], [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 9c6e231ad1..19c8abc7ea 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 \ -- cgit 1.2.3-korg