mirror of
https://git.yoctoproject.org/poky
synced 2026-03-12 10:19:44 +01:00
6a0d24ba1c
Pulls in several CVE fixes. Added a patch to avoid timer_create cross compile issue (and submitted upstream). Also submit the race fix upstream. We disable timer_create in the native case since some systems have it and some don't so this makes us consistent. (From OE-Core rev: 8b42e405fc630537398116a1429a9bc7cb2152ab) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit d0c1de084c7ce030d47a428e4bbfbc4ce2996057) Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
configure.ac: Fix create_timer solaris test for cross compiling
|
|
|
|
A runtime test was added for create_timer however this meant cross compiling
|
|
would no longer work. Allow a cache value to be specified to allow cross
|
|
compiling again.
|
|
|
|
Signed-off-by: Richard Purdie richard.purdie@linuxfoundation.org
|
|
|
|
Upstream-Status: Submitted [https://github.com/vim/vim/pull/10777]
|
|
|
|
Index: git/src/configure.ac
|
|
===================================================================
|
|
--- git.orig/src/configure.ac
|
|
+++ git/src/configure.ac
|
|
@@ -3814,7 +3814,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
|
|
dnl Check for timer_create. It probably requires the 'rt' library.
|
|
dnl Run the program to find out if timer_create(CLOCK_MONOTONIC) actually
|
|
dnl works, on Solaris timer_create() exists but fails at runtime.
|
|
-AC_MSG_CHECKING([for timer_create])
|
|
+AC_CACHE_CHECK([for timer_create], [vim_cv_timer_create],
|
|
save_LIBS="$LIBS"
|
|
LIBS="$LIBS -lrt"
|
|
AC_RUN_IFELSE([AC_LANG_PROGRAM([
|
|
@@ -3831,7 +3831,7 @@ static void set_flag(union sigval sv) {}
|
|
if (timer_create(CLOCK_MONOTONIC, &action, &timer_id) < 0)
|
|
exit(1); // cannot create a monotonic timer
|
|
])],
|
|
- AC_MSG_RESULT(yes; with -lrt); AC_DEFINE(HAVE_TIMER_CREATE),
|
|
+ AC_MSG_NOTICE(timer_create with -lrt); vim_cv_timer_create=yes,
|
|
LIBS="$save_LIBS"
|
|
AC_RUN_IFELSE([AC_LANG_PROGRAM([
|
|
#include<signal.h>
|
|
@@ -3847,8 +3847,16 @@ static void set_flag(union sigval sv) {}
|
|
if (timer_create(CLOCK_MONOTONIC, &action, &timer_id) < 0)
|
|
exit(1); // cannot create a monotonic timer
|
|
])],
|
|
- AC_MSG_RESULT(yes); AC_DEFINE(HAVE_TIMER_CREATE),
|
|
- AC_MSG_RESULT(no)))
|
|
+ vim_cv_timer_create=yes,
|
|
+ vim_cv_timer_create=no),
|
|
+ AC_MSG_ERROR(cross-compiling: please set 'vim_cv_timer_create')
|
|
+ )
|
|
+)
|
|
+
|
|
+if test "x$vim_cv_timer_create" = "xyes" ; then
|
|
+ AC_DEFINE(HAVE_TIMER_CREATE)
|
|
+fi
|
|
+
|
|
|
|
AC_CACHE_CHECK([whether stat() ignores a trailing slash], [vim_cv_stat_ignores_slash],
|
|
[
|