diff options
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-support/vim/files/disable_acl_header_check.patch | 27 | ||||
-rw-r--r-- | meta-oe/recipes-support/vim/vim_7.4.258.bb | 4 |
2 files changed, 30 insertions, 1 deletions
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 000000000..8f824e78b --- /dev/null +++ b/meta-oe/recipes-support/vim/files/disable_acl_header_check.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | Upstream-Status: pending | ||
2 | |||
3 | Don't check 'sys/acl.h' if acl support disabled for vim/vim-tiny. | ||
4 | |||
5 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | ||
6 | ================================================ | ||
7 | diff --git a/src/configure.in b/src/configure.in | ||
8 | index fb965e5..d734064 100644 | ||
9 | --- a/src/configure.in | ||
10 | +++ b/src/configure.in | ||
11 | @@ -2511,7 +2511,7 @@ AC_CHECK_HEADERS(stdarg.h stdint.h stdlib.h string.h \ | ||
12 | sys/systeminfo.h locale.h sys/stream.h termios.h \ | ||
13 | libc.h sys/statfs.h poll.h sys/poll.h pwd.h \ | ||
14 | utime.h sys/param.h libintl.h libgen.h \ | ||
15 | - util/debug.h util/msg18n.h frame.h sys/acl.h \ | ||
16 | + util/debug.h util/msg18n.h frame.h \ | ||
17 | sys/access.h sys/sysinfo.h wchar.h wctype.h) | ||
18 | |||
19 | dnl sys/ptem.h depends on sys/stream.h on Solaris | ||
20 | @@ -3112,6 +3112,7 @@ AC_ARG_ENABLE(acl, | ||
21 | , [enable_acl="yes"]) | ||
22 | if test "$enable_acl" = "yes"; then | ||
23 | AC_MSG_RESULT(no) | ||
24 | +AC_CHECK_HEADERS(sys/acl.h) | ||
25 | AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"], | ||
26 | AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl" | ||
27 | 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 023e8fc6c..9c6e231ad 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" | |||
6 | LICENSE = "vim" | 6 | LICENSE = "vim" |
7 | LIC_FILES_CHKSUM = "file://../runtime/doc/uganda.txt;md5=b779e18be6ed77facc770691c967b8f8" | 7 | LIC_FILES_CHKSUM = "file://../runtime/doc/uganda.txt;md5=b779e18be6ed77facc770691c967b8f8" |
8 | 8 | ||
9 | SRC_URI = "hg://vim.googlecode.com/hg/;protocol=https;module=vim" | 9 | SRC_URI = "hg://vim.googlecode.com/hg/;protocol=https;module=vim \ |
10 | file://disable_acl_header_check.patch;patchdir=.. \ | ||
11 | " | ||
10 | SRCREV = "v7-4-258" | 12 | SRCREV = "v7-4-258" |
11 | 13 | ||
12 | S = "${WORKDIR}/${PN}/src" | 14 | S = "${WORKDIR}/${PN}/src" |