adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 8.2.0664: included undesired changes in Makefile

Browse Source 
Problem:    Included undesired changes in Makefile.
Solution:   Revert the changes.
This commit is contained in:
Bram Moolenaar
2020-04-29 23:11:32 +02:00
parent 512fe833c3
commit 8dbafd0790
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Makefile
View File

@ -404,7 +404,7 @@ CClink = $(CC)
# 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
@ -447,10 +447,10 @@ CONF_OPT_PERL = --enable-perlinterp
# dlopen(), dlsym(), dlclose(), i.e. pythonX.Y.so must be available # dlopen(), dlsym(), dlclose(), i.e. pythonX.Y.so must be available
# However, this may still cause problems, such as "import termios" failing. # However, this may still cause problems, such as "import termios" failing.
# Build two separate versions of Vim in that case. # Build two separate versions of Vim in that case.
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
@ -460,19 +460,19 @@ CONF_OPT_PYTHON3 = --enable-python3interp
# Note: you need the development package (e.g., ruby1.9.1-dev on Ubuntu). # Note: you need the development package (e.g., ruby1.9.1-dev on Ubuntu).
# 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
# TCL # TCL
# 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.
#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|).
@ -540,7 +540,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>"
@ -614,7 +614,7 @@ CONF_OPT_FEAT = --with-features=huge
# Use this with GCC to check for mistakes, unused arguments, etc. # Use this with GCC to check for mistakes, unused arguments, etc.
# 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 # parameters, you can add -Wno-cast-function-type
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
# 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
@ -707,12 +707,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

@ -746,6 +746,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 */
/**/
664,
/**/ /**/
663, 663,
/**/ /**/