aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.3863: various build flags accidentally enabled

Browse Source 
Problem:    Various build flags accidentally enabled.
Solution:   Revert several lines in Makefile.
This commit is contained in:
Bram Moolenaar 2021-12-20 22:12:53 +00:00
parent dab17a0689
commit 8d95d7091d
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Makefile
View File

@ -368,7 +368,7 @@ CClink = $(CC)
#CONF_OPT_GUI = --enable-gui=gtk2 --disable-gtktest #CONF_OPT_GUI = --enable-gui=gtk2 --disable-gtktest
#CONF_OPT_GUI = --enable-gui=gnome2 #CONF_OPT_GUI = --enable-gui=gnome2
#CONF_OPT_GUI = --enable-gui=gnome2 --disable-gtktest #CONF_OPT_GUI = --enable-gui=gnome2 --disable-gtktest
CONF_OPT_GUI = --enable-gui=gtk3 #CONF_OPT_GUI = --enable-gui=gtk3
#CONF_OPT_GUI = --enable-gui=gtk3 --disable-gtktest #CONF_OPT_GUI = --enable-gui=gtk3 --disable-gtktest
#CONF_OPT_GUI = --enable-gui=motif #CONF_OPT_GUI = --enable-gui=motif
#CONF_OPT_GUI = --enable-gui=motif --with-motif-lib="-static -lXm -shared" #CONF_OPT_GUI = --enable-gui=motif --with-motif-lib="-static -lXm -shared"
@ -404,7 +404,7 @@ CONF_OPT_GUI = --enable-gui=gtk3
# Use --with-luajit if you want to use LuaJIT instead of Lua. # Use --with-luajit if you want to use LuaJIT instead of Lua.
# Set PATH environment variable to find lua or luajit executable. # Set PATH environment variable to find lua or luajit executable.
# This requires at least "normal" features, "tiny" and "small" don't work. # This requires at least "normal" features, "tiny" and "small" don't work.
CONF_OPT_LUA = --enable-luainterp #CONF_OPT_LUA = --enable-luainterp
#CONF_OPT_LUA = --enable-luainterp=dynamic #CONF_OPT_LUA = --enable-luainterp=dynamic
#CONF_OPT_LUA = --enable-luainterp --with-luajit #CONF_OPT_LUA = --enable-luainterp --with-luajit
#CONF_OPT_LUA = --enable-luainterp=dynamic --with-luajit #CONF_OPT_LUA = --enable-luainterp=dynamic --with-luajit
@ -433,7 +433,7 @@ CONF_OPT_LUA = --enable-luainterp
# When you get an error for a missing "perl.exp" file, try creating an empty # When you get an error for a missing "perl.exp" file, try creating an empty
# one: "touch perl.exp". # one: "touch perl.exp".
# This requires at least "normal" features, "tiny" and "small" don't work. # This requires at least "normal" features, "tiny" and "small" don't work.
CONF_OPT_PERL = --enable-perlinterp #CONF_OPT_PERL = --enable-perlinterp
#CONF_OPT_PERL = --enable-perlinterp=dynamic #CONF_OPT_PERL = --enable-perlinterp=dynamic
# PYTHON # PYTHON
@ -453,7 +453,7 @@ CONF_OPT_PERL = --enable-perlinterp
#CONF_OPT_PYTHON = --enable-pythoninterp #CONF_OPT_PYTHON = --enable-pythoninterp
#CONF_OPT_PYTHON = --enable-pythoninterp --with-python-command=python2.7 #CONF_OPT_PYTHON = --enable-pythoninterp --with-python-command=python2.7
#CONF_OPT_PYTHON = --enable-pythoninterp=dynamic #CONF_OPT_PYTHON = --enable-pythoninterp=dynamic
CONF_OPT_PYTHON3 = --enable-python3interp #CONF_OPT_PYTHON3 = --enable-python3interp
#CONF_OPT_PYTHON3 = --enable-python3interp --with-python3-command=python3.6 #CONF_OPT_PYTHON3 = --enable-python3interp --with-python3-command=python3.6
#CONF_OPT_PYTHON3 = --enable-python3interp=dynamic #CONF_OPT_PYTHON3 = --enable-python3interp=dynamic
@ -462,7 +462,7 @@ CONF_OPT_PYTHON3 = --enable-python3interp
# First one for static linking, second one for loading when used. # First one for static linking, second one for loading when used.
# Debian package is "ruby-dev". # Debian package is "ruby-dev".
# This requires at least "normal" features, "tiny" and "small" don't work. # This requires at least "normal" features, "tiny" and "small" don't work.
CONF_OPT_RUBY = --enable-rubyinterp #CONF_OPT_RUBY = --enable-rubyinterp
#CONF_OPT_RUBY = --enable-rubyinterp=dynamic #CONF_OPT_RUBY = --enable-rubyinterp=dynamic
#CONF_OPT_RUBY = --enable-rubyinterp --with-ruby-command=ruby1.9.1 #CONF_OPT_RUBY = --enable-rubyinterp --with-ruby-command=ruby1.9.1
@ -470,13 +470,13 @@ CONF_OPT_RUBY = --enable-rubyinterp
# Uncomment this when you want to include the Tcl interface. # Uncomment this when you want to include the Tcl interface.
# First one is for static linking, second one for dynamic loading. # First one is for static linking, second one for dynamic loading.
# Debian package is "tcl-dev". # Debian package is "tcl-dev".
CONF_OPT_TCL = --enable-tclinterp #CONF_OPT_TCL = --enable-tclinterp
#CONF_OPT_TCL = --enable-tclinterp=dynamic #CONF_OPT_TCL = --enable-tclinterp=dynamic
#CONF_OPT_TCL = --enable-tclinterp --with-tclsh=tclsh8.4 #CONF_OPT_TCL = --enable-tclinterp --with-tclsh=tclsh8.4
# CSCOPE # CSCOPE
# Uncomment this when you want to include the Cscope interface. # Uncomment this when you want to include the Cscope interface.
CONF_OPT_CSCOPE = --enable-cscope #CONF_OPT_CSCOPE = --enable-cscope
# NETBEANS - NetBeans interface. Only works with Motif, GTK, and gnome. # NETBEANS - NetBeans interface. Only works with Motif, GTK, and gnome.
# Motif version must have XPM libraries (see |netbeans-xpm|). # Motif version must have XPM libraries (see |netbeans-xpm|).
@ -548,7 +548,7 @@ CONF_OPT_CSCOPE = --enable-cscope
#CONF_OPT_FEAT = --with-features=small #CONF_OPT_FEAT = --with-features=small
#CONF_OPT_FEAT = --with-features=normal #CONF_OPT_FEAT = --with-features=normal
#CONF_OPT_FEAT = --with-features=big #CONF_OPT_FEAT = --with-features=big
CONF_OPT_FEAT = --with-features=huge #CONF_OPT_FEAT = --with-features=huge
# COMPILED BY - For including a specific e-mail address for ":version". # COMPILED BY - For including a specific e-mail address for ":version".
#CONF_OPT_COMPBY = "--with-compiledby=John Doe <JohnDoe@yahoo.com>" #CONF_OPT_COMPBY = "--with-compiledby=John Doe <JohnDoe@yahoo.com>"
@ -623,7 +623,7 @@ CONF_OPT_FEAT = --with-features=huge
# Note: If you use -Wextra and get warnings in GTK code about function # Note: If you use -Wextra and get warnings in GTK code about function
# parameters, you can add -Wno-cast-function-type (but not with clang) # parameters, you can add -Wno-cast-function-type (but not with clang)
#CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code -Wno-cast-function-type -Wno-deprecated-declarations -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code -Wno-cast-function-type -Wno-deprecated-declarations -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code -Wno-deprecated-declarations -D_REENTRANT -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code -Wno-deprecated-declarations -D_REENTRANT -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
# Add -Wpedantic to find // comments and other C99 constructs. # Add -Wpedantic to find // comments and other C99 constructs.
# Better disable Perl and Python to avoid a lot of warnings. # Better disable Perl and Python to avoid a lot of warnings.
#CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wunreachable-code -Wunused-result -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wunreachable-code -Wunused-result -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
@ -727,12 +727,12 @@ SANITIZER_LIBS = $(SANITIZER_CFLAGS)
# Configuration is in the .ccmalloc or ~/.ccmalloc file. # Configuration is in the .ccmalloc or ~/.ccmalloc file.
# Doesn't work very well, since memory linked to from global variables # Doesn't work very well, since memory linked to from global variables
# (in libraries) is also marked as leaked memory. # (in libraries) is also marked as leaked memory.
LEAK_CFLAGS = -DEXITFREE #LEAK_CFLAGS = -DEXITFREE
#LEAK_LIBS = -lccmalloc #LEAK_LIBS = -lccmalloc
# Uncomment this line to have Vim call abort() when an internal error is # Uncomment this line to have Vim call abort() when an internal error is
# detected. Useful when using a tool to find errors. # detected. Useful when using a tool to find errors.
ABORT_CFLAGS = -DABORT_ON_INTERNAL_ERROR #ABORT_CFLAGS = -DABORT_ON_INTERNAL_ERROR
#################################################### ####################################################
### Specific systems, check if yours is listed ### {{{ ### Specific systems, check if yours is listed ### {{{

2
src/version.c
View File

@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3863,
/**/ /**/
3862, 3862,
/**/ /**/