mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

vim: don't check acl header if acl support disabled

Browse Source 
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>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Chong Lu
2014-04-18 18:16:31 +08:00
committed by Martin Jansa
parent 9dfa0411e0
commit 38d45f7446
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/vim/files/disable_acl_header_check.patch
+27
View File
@@ -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",,)],,),)
meta-oe/recipes-support/vim/vim_7.4.258.bb
+3 -1
View File
@@ -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"