diff options
author | Randy MacLeod <randy.macleod@windriver.com> | 2022-08-01 08:52:34 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-22 14:29:48 +0100 |
commit | ef2da8f28e54b306674e86e31ebca94ffc4bf50f (patch) | |
tree | 9f66fc463c406db62d130f961ba9c6b7a5cb570c /meta/recipes-support/vim/files/crosscompile.patch | |
parent | 5373e681cf22990ab780e4bce8f94138b6a3b551 (diff) | |
download | poky-ef2da8f28e54b306674e86e31ebca94ffc4bf50f.tar.gz |
vim: update from 9.0.0063 to 9.0.0115
Drop crosscompile.patch which was merged as part of:
509695c1c (tag: v9.0.0065) patch 9.0.0065: \
cross-compiling doesn't work because of timer_create check
Also drop: racefix.patch which may have been fixed upstream
and is being tracked by:
https://github.com/vim/vim/pull/10776
where upstream is asking if the different approach resolves the
race condition. Let's see what's out there!
(From OE-Core rev: 083d6de4139859a5eb66f78c2a62a1d59c8aee35)
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
(cherry picked from commit 6996472cd33d2d4b91821f2dfe24a27a697e4afe)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/vim/files/crosscompile.patch')
-rw-r--r-- | meta/recipes-support/vim/files/crosscompile.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/meta/recipes-support/vim/files/crosscompile.patch b/meta/recipes-support/vim/files/crosscompile.patch deleted file mode 100644 index 583d3fc7b0..0000000000 --- a/meta/recipes-support/vim/files/crosscompile.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | configure.ac: Fix create_timer solaris test for cross compiling | ||
2 | |||
3 | A runtime test was added for create_timer however this meant cross compiling | ||
4 | would no longer work. Allow a cache value to be specified to allow cross | ||
5 | compiling again. | ||
6 | |||
7 | Signed-off-by: Richard Purdie richard.purdie@linuxfoundation.org | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/vim/vim/pull/10777] | ||
10 | |||
11 | Index: git/src/configure.ac | ||
12 | =================================================================== | ||
13 | --- git.orig/src/configure.ac | ||
14 | +++ git/src/configure.ac | ||
15 | @@ -3814,7 +3814,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( | ||
16 | dnl Check for timer_create. It probably requires the 'rt' library. | ||
17 | dnl Run the program to find out if timer_create(CLOCK_MONOTONIC) actually | ||
18 | dnl works, on Solaris timer_create() exists but fails at runtime. | ||
19 | -AC_MSG_CHECKING([for timer_create]) | ||
20 | +AC_CACHE_CHECK([for timer_create], [vim_cv_timer_create], | ||
21 | save_LIBS="$LIBS" | ||
22 | LIBS="$LIBS -lrt" | ||
23 | AC_RUN_IFELSE([AC_LANG_PROGRAM([ | ||
24 | @@ -3831,7 +3831,7 @@ static void set_flag(union sigval sv) {} | ||
25 | if (timer_create(CLOCK_MONOTONIC, &action, &timer_id) < 0) | ||
26 | exit(1); // cannot create a monotonic timer | ||
27 | ])], | ||
28 | - AC_MSG_RESULT(yes; with -lrt); AC_DEFINE(HAVE_TIMER_CREATE), | ||
29 | + AC_MSG_NOTICE(timer_create with -lrt); vim_cv_timer_create=yes, | ||
30 | LIBS="$save_LIBS" | ||
31 | AC_RUN_IFELSE([AC_LANG_PROGRAM([ | ||
32 | #include<signal.h> | ||
33 | @@ -3847,8 +3847,16 @@ static void set_flag(union sigval sv) {} | ||
34 | if (timer_create(CLOCK_MONOTONIC, &action, &timer_id) < 0) | ||
35 | exit(1); // cannot create a monotonic timer | ||
36 | ])], | ||
37 | - AC_MSG_RESULT(yes); AC_DEFINE(HAVE_TIMER_CREATE), | ||
38 | - AC_MSG_RESULT(no))) | ||
39 | + vim_cv_timer_create=yes, | ||
40 | + vim_cv_timer_create=no), | ||
41 | + AC_MSG_ERROR(cross-compiling: please set 'vim_cv_timer_create') | ||
42 | + ) | ||
43 | +) | ||
44 | + | ||
45 | +if test "x$vim_cv_timer_create" = "xyes" ; then | ||
46 | + AC_DEFINE(HAVE_TIMER_CREATE) | ||
47 | +fi | ||
48 | + | ||
49 | |||
50 | AC_CACHE_CHECK([whether stat() ignores a trailing slash], [vim_cv_stat_ignores_slash], | ||
51 | [ | ||