Mercurial > vim
comparison src/Makefile @ 26668:f2579ccc97db v8.2.3863
patch 8.2.3863: various build flags accidentally enabled
Commit: https://github.com/vim/vim/commit/8d95d7091da08d0a236be4a16616e3dda388e58d
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Dec 20 22:12:53 2021 +0000
patch 8.2.3863: various build flags accidentally enabled
Problem: Various build flags accidentally enabled.
Solution: Revert several lines in Makefile.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 20 Dec 2021 23:15:03 +0100 |
parents | 4b23672d1f0e |
children | fccd67ae58c8 |
comparison
equal
deleted
inserted
replaced
26667:fde630a228e5 | 26668:f2579ccc97db |
---|---|
366 # If the selected GUI isn't found, the GUI is disabled automatically | 366 # If the selected GUI isn't found, the GUI is disabled automatically |
367 #CONF_OPT_GUI = --enable-gui=gtk2 | 367 #CONF_OPT_GUI = --enable-gui=gtk2 |
368 #CONF_OPT_GUI = --enable-gui=gtk2 --disable-gtktest | 368 #CONF_OPT_GUI = --enable-gui=gtk2 --disable-gtktest |
369 #CONF_OPT_GUI = --enable-gui=gnome2 | 369 #CONF_OPT_GUI = --enable-gui=gnome2 |
370 #CONF_OPT_GUI = --enable-gui=gnome2 --disable-gtktest | 370 #CONF_OPT_GUI = --enable-gui=gnome2 --disable-gtktest |
371 CONF_OPT_GUI = --enable-gui=gtk3 | 371 #CONF_OPT_GUI = --enable-gui=gtk3 |
372 #CONF_OPT_GUI = --enable-gui=gtk3 --disable-gtktest | 372 #CONF_OPT_GUI = --enable-gui=gtk3 --disable-gtktest |
373 #CONF_OPT_GUI = --enable-gui=motif | 373 #CONF_OPT_GUI = --enable-gui=motif |
374 #CONF_OPT_GUI = --enable-gui=motif --with-motif-lib="-static -lXm -shared" | 374 #CONF_OPT_GUI = --enable-gui=motif --with-motif-lib="-static -lXm -shared" |
375 #CONF_OPT_GUI = --enable-gui=athena | 375 #CONF_OPT_GUI = --enable-gui=athena |
376 #CONF_OPT_GUI = --enable-gui=nextaw | 376 #CONF_OPT_GUI = --enable-gui=nextaw |
402 # Debian package is "lua5.3" and "liblua5.3-dev" or "lua5.4" and | 402 # Debian package is "lua5.3" and "liblua5.3-dev" or "lua5.4" and |
403 # "liblua5.4-dev". | 403 # "liblua5.4-dev". |
404 # Use --with-luajit if you want to use LuaJIT instead of Lua. | 404 # Use --with-luajit if you want to use LuaJIT instead of Lua. |
405 # Set PATH environment variable to find lua or luajit executable. | 405 # Set PATH environment variable to find lua or luajit executable. |
406 # This requires at least "normal" features, "tiny" and "small" don't work. | 406 # This requires at least "normal" features, "tiny" and "small" don't work. |
407 CONF_OPT_LUA = --enable-luainterp | 407 #CONF_OPT_LUA = --enable-luainterp |
408 #CONF_OPT_LUA = --enable-luainterp=dynamic | 408 #CONF_OPT_LUA = --enable-luainterp=dynamic |
409 #CONF_OPT_LUA = --enable-luainterp --with-luajit | 409 #CONF_OPT_LUA = --enable-luainterp --with-luajit |
410 #CONF_OPT_LUA = --enable-luainterp=dynamic --with-luajit | 410 #CONF_OPT_LUA = --enable-luainterp=dynamic --with-luajit |
411 # Lua installation dir (when not set uses $LUA_PREFIX or defaults to /usr) | 411 # Lua installation dir (when not set uses $LUA_PREFIX or defaults to /usr) |
412 #CONF_OPT_LUA_PREFIX = --with-lua-prefix=/usr/local | 412 #CONF_OPT_LUA_PREFIX = --with-lua-prefix=/usr/local |
431 # auto/config.mk where they come from. If it's PERL_CFLAGS, try commenting | 431 # auto/config.mk where they come from. If it's PERL_CFLAGS, try commenting |
432 # the next line. | 432 # the next line. |
433 # When you get an error for a missing "perl.exp" file, try creating an empty | 433 # When you get an error for a missing "perl.exp" file, try creating an empty |
434 # one: "touch perl.exp". | 434 # one: "touch perl.exp". |
435 # This requires at least "normal" features, "tiny" and "small" don't work. | 435 # This requires at least "normal" features, "tiny" and "small" don't work. |
436 CONF_OPT_PERL = --enable-perlinterp | 436 #CONF_OPT_PERL = --enable-perlinterp |
437 #CONF_OPT_PERL = --enable-perlinterp=dynamic | 437 #CONF_OPT_PERL = --enable-perlinterp=dynamic |
438 | 438 |
439 # PYTHON | 439 # PYTHON |
440 # Uncomment lines here when you want to include the Python interface. | 440 # Uncomment lines here when you want to include the Python interface. |
441 # Debian package is "libpython3-dev". | 441 # Debian package is "libpython3-dev". |
451 # However, this may still cause problems, such as "import termios" failing. | 451 # However, this may still cause problems, such as "import termios" failing. |
452 # Build two separate versions of Vim in that case. | 452 # Build two separate versions of Vim in that case. |
453 #CONF_OPT_PYTHON = --enable-pythoninterp | 453 #CONF_OPT_PYTHON = --enable-pythoninterp |
454 #CONF_OPT_PYTHON = --enable-pythoninterp --with-python-command=python2.7 | 454 #CONF_OPT_PYTHON = --enable-pythoninterp --with-python-command=python2.7 |
455 #CONF_OPT_PYTHON = --enable-pythoninterp=dynamic | 455 #CONF_OPT_PYTHON = --enable-pythoninterp=dynamic |
456 CONF_OPT_PYTHON3 = --enable-python3interp | 456 #CONF_OPT_PYTHON3 = --enable-python3interp |
457 #CONF_OPT_PYTHON3 = --enable-python3interp --with-python3-command=python3.6 | 457 #CONF_OPT_PYTHON3 = --enable-python3interp --with-python3-command=python3.6 |
458 #CONF_OPT_PYTHON3 = --enable-python3interp=dynamic | 458 #CONF_OPT_PYTHON3 = --enable-python3interp=dynamic |
459 | 459 |
460 # RUBY | 460 # RUBY |
461 # Uncomment this when you want to include the Ruby interface. | 461 # Uncomment this when you want to include the Ruby interface. |
462 # First one for static linking, second one for loading when used. | 462 # First one for static linking, second one for loading when used. |
463 # Debian package is "ruby-dev". | 463 # Debian package is "ruby-dev". |
464 # This requires at least "normal" features, "tiny" and "small" don't work. | 464 # This requires at least "normal" features, "tiny" and "small" don't work. |
465 CONF_OPT_RUBY = --enable-rubyinterp | 465 #CONF_OPT_RUBY = --enable-rubyinterp |
466 #CONF_OPT_RUBY = --enable-rubyinterp=dynamic | 466 #CONF_OPT_RUBY = --enable-rubyinterp=dynamic |
467 #CONF_OPT_RUBY = --enable-rubyinterp --with-ruby-command=ruby1.9.1 | 467 #CONF_OPT_RUBY = --enable-rubyinterp --with-ruby-command=ruby1.9.1 |
468 | 468 |
469 # TCL | 469 # TCL |
470 # Uncomment this when you want to include the Tcl interface. | 470 # Uncomment this when you want to include the Tcl interface. |
471 # First one is for static linking, second one for dynamic loading. | 471 # First one is for static linking, second one for dynamic loading. |
472 # Debian package is "tcl-dev". | 472 # Debian package is "tcl-dev". |
473 CONF_OPT_TCL = --enable-tclinterp | 473 #CONF_OPT_TCL = --enable-tclinterp |
474 #CONF_OPT_TCL = --enable-tclinterp=dynamic | 474 #CONF_OPT_TCL = --enable-tclinterp=dynamic |
475 #CONF_OPT_TCL = --enable-tclinterp --with-tclsh=tclsh8.4 | 475 #CONF_OPT_TCL = --enable-tclinterp --with-tclsh=tclsh8.4 |
476 | 476 |
477 # CSCOPE | 477 # CSCOPE |
478 # Uncomment this when you want to include the Cscope interface. | 478 # Uncomment this when you want to include the Cscope interface. |
479 CONF_OPT_CSCOPE = --enable-cscope | 479 #CONF_OPT_CSCOPE = --enable-cscope |
480 | 480 |
481 # NETBEANS - NetBeans interface. Only works with Motif, GTK, and gnome. | 481 # NETBEANS - NetBeans interface. Only works with Motif, GTK, and gnome. |
482 # Motif version must have XPM libraries (see |netbeans-xpm|). | 482 # Motif version must have XPM libraries (see |netbeans-xpm|). |
483 # Uncomment this when you do not want the netbeans interface. | 483 # Uncomment this when you do not want the netbeans interface. |
484 #CONF_OPT_NETBEANS = --disable-netbeans | 484 #CONF_OPT_NETBEANS = --disable-netbeans |
546 # The default is "huge" for most systems. | 546 # The default is "huge" for most systems. |
547 #CONF_OPT_FEAT = --with-features=tiny | 547 #CONF_OPT_FEAT = --with-features=tiny |
548 #CONF_OPT_FEAT = --with-features=small | 548 #CONF_OPT_FEAT = --with-features=small |
549 #CONF_OPT_FEAT = --with-features=normal | 549 #CONF_OPT_FEAT = --with-features=normal |
550 #CONF_OPT_FEAT = --with-features=big | 550 #CONF_OPT_FEAT = --with-features=big |
551 CONF_OPT_FEAT = --with-features=huge | 551 #CONF_OPT_FEAT = --with-features=huge |
552 | 552 |
553 # COMPILED BY - For including a specific e-mail address for ":version". | 553 # COMPILED BY - For including a specific e-mail address for ":version". |
554 #CONF_OPT_COMPBY = "--with-compiledby=John Doe <JohnDoe@yahoo.com>" | 554 #CONF_OPT_COMPBY = "--with-compiledby=John Doe <JohnDoe@yahoo.com>" |
555 | 555 |
556 # X WINDOWS DISABLE - For creating a plain Vim without any X11 related fancies | 556 # X WINDOWS DISABLE - For creating a plain Vim without any X11 related fancies |
621 | 621 |
622 # Use this with GCC to check for mistakes, unused arguments, etc. | 622 # Use this with GCC to check for mistakes, unused arguments, etc. |
623 # Note: If you use -Wextra and get warnings in GTK code about function | 623 # Note: If you use -Wextra and get warnings in GTK code about function |
624 # parameters, you can add -Wno-cast-function-type (but not with clang) | 624 # parameters, you can add -Wno-cast-function-type (but not with clang) |
625 #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code -Wno-cast-function-type -Wno-deprecated-declarations -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 | 625 #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code -Wno-cast-function-type -Wno-deprecated-declarations -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 |
626 CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code -Wno-deprecated-declarations -D_REENTRANT -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 | 626 #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code -Wno-deprecated-declarations -D_REENTRANT -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 |
627 # Add -Wpedantic to find // comments and other C99 constructs. | 627 # Add -Wpedantic to find // comments and other C99 constructs. |
628 # Better disable Perl and Python to avoid a lot of warnings. | 628 # Better disable Perl and Python to avoid a lot of warnings. |
629 #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wunreachable-code -Wunused-result -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 | 629 #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wunreachable-code -Wunused-result -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 |
630 #CFLAGS = -g -O2 -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wunreachable-code -Wno-cast-function-type -Wunused-result -Wno-deprecated-declarations -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 | 630 #CFLAGS = -g -O2 -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wunreachable-code -Wno-cast-function-type -Wunused-result -Wno-deprecated-declarations -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 |
631 #PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers | 631 #PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers |
725 # MEMORY LEAK DETECTION | 725 # MEMORY LEAK DETECTION |
726 # Requires installing the ccmalloc library. | 726 # Requires installing the ccmalloc library. |
727 # Configuration is in the .ccmalloc or ~/.ccmalloc file. | 727 # Configuration is in the .ccmalloc or ~/.ccmalloc file. |
728 # Doesn't work very well, since memory linked to from global variables | 728 # Doesn't work very well, since memory linked to from global variables |
729 # (in libraries) is also marked as leaked memory. | 729 # (in libraries) is also marked as leaked memory. |
730 LEAK_CFLAGS = -DEXITFREE | 730 #LEAK_CFLAGS = -DEXITFREE |
731 #LEAK_LIBS = -lccmalloc | 731 #LEAK_LIBS = -lccmalloc |
732 | 732 |
733 # Uncomment this line to have Vim call abort() when an internal error is | 733 # Uncomment this line to have Vim call abort() when an internal error is |
734 # detected. Useful when using a tool to find errors. | 734 # detected. Useful when using a tool to find errors. |
735 ABORT_CFLAGS = -DABORT_ON_INTERNAL_ERROR | 735 #ABORT_CFLAGS = -DABORT_ON_INTERNAL_ERROR |
736 | 736 |
737 #################################################### | 737 #################################################### |
738 ### Specific systems, check if yours is listed ### {{{ | 738 ### Specific systems, check if yours is listed ### {{{ |
739 #################################################### | 739 #################################################### |
740 | 740 |