mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

vim: update from 9.0.0063 to 9.0.0115

Browse Source 
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: 27e4c6f98be296fb5f67ac7775461854d48f6c9a)

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>
This commit is contained in:
Randy MacLeod
2022-08-01 08:52:34 -04:00
committed by Richard Purdie
parent b65989b835
commit 73618dee22
3 changed files with 2 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
meta/recipes-support/vim/files/crosscompile.patch
View File

@@ -1,51 +0,0 @@
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],
[

37
meta/recipes-support/vim/files/racefix.patch
View File

@@ -1,37 +0,0 @@
po/Makefile: Avoid race over LINGUAS file
The creation of the LINGUAS file is duplicated for each desktop file
which can lead the commands to race against each other. One target might
remove it before another has been able to use it. Rework the makefile to
avoid this as the expense of leaving the file on disk.
Signed-off-by: Richard Purdie richard.purdie@linuxfoundation.org
Upstream-Status: Submitted [https://github.com/vim/vim/pull/10776]
Index: git/src/po/Makefile
===================================================================
--- git.orig/src/po/Makefile
+++ git/src/po/Makefile
@@ -207,17 +207,16 @@ $(PACKAGE).pot: $(PO_INPUTLIST) $(PO_VIM
# Delete the temporary files
rm *.js
-vim.desktop: vim.desktop.in $(POFILES)
+LINGUAS:
echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS
+
+vim.desktop: vim.desktop.in $(POFILES) LINGUAS
$(MSGFMT) --desktop -d . --template vim.desktop.in -o tmp_vim.desktop
- rm -f LINGUAS
if command -v desktop-file-validate; then desktop-file-validate tmp_vim.desktop; fi
mv tmp_vim.desktop vim.desktop
-gvim.desktop: gvim.desktop.in $(POFILES)
- echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS
+gvim.desktop: gvim.desktop.in $(POFILES) LINGUAS
$(MSGFMT) --desktop -d . --template gvim.desktop.in -o tmp_gvim.desktop
- rm -f LINGUAS
if command -v desktop-file-validate; then desktop-file-validate tmp_gvim.desktop; fi
mv tmp_gvim.desktop gvim.desktop

6
meta/recipes-support/vim/vim.inc
View File

@@ -18,12 +18,10 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \
file://vim-add-knob-whether-elf.h-are-checked.patch \
file://0001-src-Makefile-improve-reproducibility.patch \
file://no-path-adjust.patch \
file://racefix.patch \
file://crosscompile.patch \
"
PV .= ".0063"
SRCREV = "d61efa50f8f5b9d9dcbc136705cc33874f0fdcb3"
PV .= ".0115"
SRCREV = "6747cf1671bd41cddee77c65b3f9a70509f968db"
# Remove when 8.3 is out
UPSTREAM_VERSION_UNKNOWN = "1"