summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorRandy MacLeod <randy.macleod@windriver.com>2022-08-01 12:52:34 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-02 10:30:00 (GMT)
commit44cc49c67984f039dd9a9ef10681ef7ac381529a (patch)
treeafcfeab4497a8cc9e234fbb822b0d1d5ef137025 /meta/recipes-support
parent8b82f25fe65657c5fca22dc809421c8dc2660618 (diff)
downloadpoky-44cc49c67984f039dd9a9ef10681ef7ac381529a.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: 6996472cd33d2d4b91821f2dfe24a27a697e4afe) Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/vim/files/crosscompile.patch51
-rw-r--r--meta/recipes-support/vim/files/racefix.patch37
-rw-r--r--meta/recipes-support/vim/vim.inc6
3 files changed, 2 insertions, 92 deletions
diff --git a/meta/recipes-support/vim/files/crosscompile.patch b/meta/recipes-support/vim/files/crosscompile.patch
deleted file mode 100644
index 583d3fc..0000000
--- a/meta/recipes-support/vim/files/crosscompile.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1configure.ac: Fix create_timer solaris test for cross compiling
2
3A runtime test was added for create_timer however this meant cross compiling
4would no longer work. Allow a cache value to be specified to allow cross
5compiling again.
6
7Signed-off-by: Richard Purdie richard.purdie@linuxfoundation.org
8
9Upstream-Status: Submitted [https://github.com/vim/vim/pull/10777]
10
11Index: 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 [
diff --git a/meta/recipes-support/vim/files/racefix.patch b/meta/recipes-support/vim/files/racefix.patch
deleted file mode 100644
index 34bd37d..0000000
--- a/meta/recipes-support/vim/files/racefix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1po/Makefile: Avoid race over LINGUAS file
2
3The creation of the LINGUAS file is duplicated for each desktop file
4which can lead the commands to race against each other. One target might
5remove it before another has been able to use it. Rework the makefile to
6avoid this as the expense of leaving the file on disk.
7
8Signed-off-by: Richard Purdie richard.purdie@linuxfoundation.org
9
10Upstream-Status: Submitted [https://github.com/vim/vim/pull/10776]
11
12Index: git/src/po/Makefile
13===================================================================
14--- git.orig/src/po/Makefile
15+++ git/src/po/Makefile
16@@ -207,17 +207,16 @@ $(PACKAGE).pot: $(PO_INPUTLIST) $(PO_VIM
17 # Delete the temporary files
18 rm *.js
19
20-vim.desktop: vim.desktop.in $(POFILES)
21+LINGUAS:
22 echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS
23+
24+vim.desktop: vim.desktop.in $(POFILES) LINGUAS
25 $(MSGFMT) --desktop -d . --template vim.desktop.in -o tmp_vim.desktop
26- rm -f LINGUAS
27 if command -v desktop-file-validate; then desktop-file-validate tmp_vim.desktop; fi
28 mv tmp_vim.desktop vim.desktop
29
30-gvim.desktop: gvim.desktop.in $(POFILES)
31- echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS
32+gvim.desktop: gvim.desktop.in $(POFILES) LINGUAS
33 $(MSGFMT) --desktop -d . --template gvim.desktop.in -o tmp_gvim.desktop
34- rm -f LINGUAS
35 if command -v desktop-file-validate; then desktop-file-validate tmp_gvim.desktop; fi
36 mv tmp_gvim.desktop gvim.desktop
37
diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc
index 3122953..4889646 100644
--- a/meta/recipes-support/vim/vim.inc
+++ b/meta/recipes-support/vim/vim.inc
@@ -18,12 +18,10 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \
18 file://vim-add-knob-whether-elf.h-are-checked.patch \ 18 file://vim-add-knob-whether-elf.h-are-checked.patch \
19 file://0001-src-Makefile-improve-reproducibility.patch \ 19 file://0001-src-Makefile-improve-reproducibility.patch \
20 file://no-path-adjust.patch \ 20 file://no-path-adjust.patch \
21 file://racefix.patch \
22 file://crosscompile.patch \
23 " 21 "
24 22
25PV .= ".0063" 23PV .= ".0115"
26SRCREV = "d61efa50f8f5b9d9dcbc136705cc33874f0fdcb3" 24SRCREV = "6747cf1671bd41cddee77c65b3f9a70509f968db"
27 25
28# Remove when 8.3 is out 26# Remove when 8.3 is out
29UPSTREAM_VERSION_UNKNOWN = "1" 27UPSTREAM_VERSION_UNKNOWN = "1"