• R/O
  • SSH

vim: コミット

Mirror of the Vim source from https://github.com/vim/vim


コミットメタ情報

リビジョン7d66380a6b861363b7c8385ff06554021717bf79 (tree)
日時2022-01-18 20:45:03
作者Bram Moolenaar <Bram@vim....>
コミッターBram Moolenaar

ログメッセージ

patch 8.2.4129: building with +sound but without +eval fails

Commit: https://github.com/vim/vim/commit/1247126956c2ba666048b2bf99630eef7495e98e
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Jan 18 11:11:25 2022 +0000

patch 8.2.4129: building with +sound but without +eval fails
Problem: Building with +sound but without +eval fails. (Dominique Pellé)
Solution: Disable canberra in tiny and small build. (closes https://github.com/vim/vim/issues/9548)

変更サマリ

差分

diff -r 8e65bf8592f2 -r 7d66380a6b86 src/auto/configure
--- a/src/auto/configure Tue Jan 18 11:45:05 2022 +0100
+++ b/src/auto/configure Tue Jan 18 12:45:03 2022 +0100
@@ -5256,6 +5256,12 @@
52565256
52575257
52585258
5259+if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
5260+ has_eval=no
5261+else
5262+ has_eval=yes
5263+fi
5264+
52595265 { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-compiledby argument" >&5
52605266 $as_echo_n "checking --with-compiledby argument... " >&6; }
52615267
@@ -5333,7 +5339,7 @@
53335339 $as_echo "$enable_luainterp" >&6; }
53345340
53355341 if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then
5336- if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
5342+ if test "$has_eval" = "no"; then
53375343 as_fn_error $? "cannot use Lua with tiny or small features" "$LINENO" 5
53385344 fi
53395345
@@ -6103,7 +6109,7 @@
61036109 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_perlinterp" >&5
61046110 $as_echo "$enable_perlinterp" >&6; }
61056111 if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then
6106- if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
6112+ if test "$has_eval" = "no"; then
61076113 as_fn_error $? "cannot use Perl with tiny or small features" "$LINENO" 5
61086114 fi
61096115
@@ -6308,7 +6314,7 @@
63086314 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_pythoninterp" >&5
63096315 $as_echo "$enable_pythoninterp" >&6; }
63106316 if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
6311- if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
6317+ if test "$has_eval" = "no"; then
63126318 as_fn_error $? "cannot use Python with tiny or small features" "$LINENO" 5
63136319 fi
63146320
@@ -6659,7 +6665,7 @@
66596665 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_python3interp" >&5
66606666 $as_echo "$enable_python3interp" >&6; }
66616667 if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
6662- if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
6668+ if test "$has_eval" = "no"; then
66636669 as_fn_error $? "cannot use Python with tiny or small features" "$LINENO" 5
66646670 fi
66656671
@@ -7587,7 +7593,7 @@
75877593 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_rubyinterp" >&5
75887594 $as_echo "$enable_rubyinterp" >&6; }
75897595 if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
7590- if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
7596+ if test "$has_eval" = "no"; then
75917597 as_fn_error $? "cannot use Ruby with tiny or small features" "$LINENO" 5
75927598 fi
75937599
@@ -7765,7 +7771,7 @@
77657771 fi
77667772
77677773 if test "$enable_netbeans" = "yes"; then
7768- if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
7774+ if test "$has_eval" = "no"; then
77697775 { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use NetBeans with tiny or small features" >&5
77707776 $as_echo "cannot use NetBeans with tiny or small features" >&6; }
77717777 enable_netbeans="no"
@@ -7788,7 +7794,7 @@
77887794 fi
77897795
77907796 if test "$enable_channel" = "yes"; then
7791- if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
7797+ if test "$has_eval" = "no"; then
77927798 { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use channels with tiny or small features" >&5
77937799 $as_echo "cannot use channels with tiny or small features" >&6; }
77947800 enable_channel="no"
@@ -8092,7 +8098,7 @@
80928098 fi
80938099
80948100 if test "$enable_terminal" = "yes" || test "$enable_terminal" = "auto" -a "x$features" = "xhuge" ; then
8095- if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
8101+ if test "$has_eval" = "no"; then
80968102 { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use terminal emulator with tiny or small features" >&5
80978103 $as_echo "cannot use terminal emulator with tiny or small features" >&6; }
80988104 enable_terminal="no"
@@ -13051,8 +13057,14 @@
1305113057 enable_canberra="no"
1305213058 fi
1305313059 else
13054- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_canberra" >&5
13060+ if test "$enable_canberra" = "yes" -a "$has_eval" = "no"; then
13061+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use sound with tiny or small features" >&5
13062+$as_echo "cannot use sound with tiny or small features" >&6; }
13063+ enable_canberra="no"
13064+ else
13065+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_canberra" >&5
1305513066 $as_echo "$enable_canberra" >&6; }
13067+ fi
1305613068 fi
1305713069 if test "$enable_canberra" = "yes"; then
1305813070 if test "x$PKG_CONFIG" != "xno"; then
@@ -13067,7 +13079,7 @@
1306713079 $as_echo_n "checking for libcanberra... " >&6; }
1306813080 ac_save_CFLAGS="$CFLAGS"
1306913081 ac_save_LIBS="$LIBS"
13070- if `echo "$CFLAGS" | grep -v "$canberra_cflags" >/dev/null`; then
13082+ if `echo "$CFLAGS" | grep -v "$canberra_cflags" 2>/dev/null`; then
1307113083 CFLAGS="$CFLAGS $canberra_cflags"
1307213084 fi
1307313085 LIBS="$LIBS $canberra_lib"
diff -r 8e65bf8592f2 -r 7d66380a6b86 src/configure.ac
--- a/src/configure.ac Tue Jan 18 11:45:05 2022 +0100
+++ b/src/configure.ac Tue Jan 18 12:45:03 2022 +0100
@@ -540,6 +540,12 @@
540540 AC_SUBST(dovimdiff)
541541 AC_SUBST(dogvimdiff)
542542
543+if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
544+ has_eval=no
545+else
546+ has_eval=yes
547+fi
548+
543549 AC_MSG_CHECKING(--with-compiledby argument)
544550 AC_ARG_WITH(compiledby, [ --with-compiledby=NAME name to show in :version message],
545551 compiledby="$withval"; AC_MSG_RESULT($withval),
@@ -585,7 +591,7 @@
585591 AC_MSG_RESULT($enable_luainterp)
586592
587593 if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then
588- if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
594+ if test "$has_eval" = "no"; then
589595 AC_MSG_ERROR([cannot use Lua with tiny or small features])
590596 fi
591597
@@ -1072,7 +1078,7 @@
10721078 [enable_perlinterp="no"])
10731079 AC_MSG_RESULT($enable_perlinterp)
10741080 if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then
1075- if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
1081+ if test "$has_eval" = "no"; then
10761082 AC_MSG_ERROR([cannot use Perl with tiny or small features])
10771083 fi
10781084 AC_SUBST(vi_cv_path_perl)
@@ -1221,7 +1227,7 @@
12211227 [enable_pythoninterp="no"])
12221228 AC_MSG_RESULT($enable_pythoninterp)
12231229 if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
1224- if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
1230+ if test "$has_eval" = "no"; then
12251231 AC_MSG_ERROR([cannot use Python with tiny or small features])
12261232 fi
12271233
@@ -1456,7 +1462,7 @@
14561462 [enable_python3interp="no"])
14571463 AC_MSG_RESULT($enable_python3interp)
14581464 if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
1459- if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
1465+ if test "$has_eval" = "no"; then
14601466 AC_MSG_ERROR([cannot use Python with tiny or small features])
14611467 fi
14621468
@@ -1969,7 +1975,7 @@
19691975 [enable_rubyinterp="no"])
19701976 AC_MSG_RESULT($enable_rubyinterp)
19711977 if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
1972- if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
1978+ if test "$has_eval" = "no"; then
19731979 AC_MSG_ERROR([cannot use Ruby with tiny or small features])
19741980 fi
19751981
@@ -2082,7 +2088,7 @@
20822088 [ --disable-netbeans Disable NetBeans integration support.],
20832089 , [enable_netbeans="yes"])
20842090 if test "$enable_netbeans" = "yes"; then
2085- if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
2091+ if test "$has_eval" = "no"; then
20862092 AC_MSG_RESULT([cannot use NetBeans with tiny or small features])
20872093 enable_netbeans="no"
20882094 else
@@ -2097,7 +2103,7 @@
20972103 [ --disable-channel Disable process communication support.],
20982104 , [enable_channel="yes"])
20992105 if test "$enable_channel" = "yes"; then
2100- if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
2106+ if test "$has_eval" = "no"; then
21012107 AC_MSG_RESULT([cannot use channels with tiny or small features])
21022108 enable_channel="no"
21032109 else
@@ -2205,7 +2211,7 @@
22052211 [ --enable-terminal Enable terminal emulation support.],
22062212 , [enable_terminal="auto"])
22072213 if test "$enable_terminal" = "yes" || test "$enable_terminal" = "auto" -a "x$features" = "xhuge" ; then
2208- if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
2214+ if test "$has_eval" = "no"; then
22092215 AC_MSG_RESULT([cannot use terminal emulator with tiny or small features])
22102216 enable_terminal="no"
22112217 else
@@ -3794,7 +3800,12 @@
37943800 enable_canberra="no"
37953801 fi
37963802 else
3797- AC_MSG_RESULT($enable_canberra)
3803+ if test "$enable_canberra" = "yes" -a "$has_eval" = "no"; then
3804+ AC_MSG_RESULT([cannot use sound with tiny or small features])
3805+ enable_canberra="no"
3806+ else
3807+ AC_MSG_RESULT($enable_canberra)
3808+ fi
37983809 fi
37993810 if test "$enable_canberra" = "yes"; then
38003811 if test "x$PKG_CONFIG" != "xno"; then
@@ -3808,7 +3819,7 @@
38083819 AC_MSG_CHECKING(for libcanberra)
38093820 ac_save_CFLAGS="$CFLAGS"
38103821 ac_save_LIBS="$LIBS"
3811- if `echo "$CFLAGS" | grep -v "$canberra_cflags" >/dev/null`; then
3822+ if `echo "$CFLAGS" | grep -v "$canberra_cflags" 2>/dev/null`; then
38123823 CFLAGS="$CFLAGS $canberra_cflags"
38133824 fi
38143825 LIBS="$LIBS $canberra_lib"
diff -r 8e65bf8592f2 -r 7d66380a6b86 src/version.c
--- a/src/version.c Tue Jan 18 11:45:05 2022 +0100
+++ b/src/version.c Tue Jan 18 12:45:03 2022 +0100
@@ -751,6 +751,8 @@
751751 static int included_patches[] =
752752 { /* Add new patch number below this line */
753753 /**/
754+ 4129,
755+/**/
754756 4128,
755757 /**/
756758 4127,
旧リポジトリブラウザで表示