Local mods in src/Makefile unduly taken up in public repository

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

Local mods in src/Makefile unduly taken up in public repository

Tony Mechelynck
At revision f60a0c9cbe6c (Add blowfish encryption), the following
changes (among others) were included in the src/Makefile:

@@ -467,9 +467,9 @@
  #CONF_OPT_FEAT = --with-features=tiny
  #CONF_OPT_FEAT = --with-features=small
  #CONF_OPT_FEAT = --with-features=normal
  #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".
  #CONF_OPT_COMPBY = "--with-compiledby=John Doe <[hidden email]>"

@@ -535,11 +535,11 @@
  #CFLAGS = -g -DDEBUG -Wall -Wshadow -Wmissing-prototypes
  #CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce
-Wall -Wmissing-prototypes

  # Use this with GCC to check for mistakes, unused arguments, etc.
-#CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code
-D_FORTIFY_SOURCE=1
-#PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
-#MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code -Wno-unused-parameter
+CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code
-D_FORTIFY_SOURCE=1
+PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
+MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code -Wno-unused-parameter

  # EFENCE - Electric-Fence malloc debugging: catches memory accesses beyond
  # allocated memory (and makes every malloc()/free() very slow).
  # Electric Fence is free (search ftp sites).


I'm not sure about the meaning of the second hunk, but the first hunk,
which sets "huge" features without checking anything, is obviously
something which was left in by error.

I routinely compile two Vim versions with different featuresets, and
until this change I could replace the copies in the Makefile in the
shadow directories by soft links, with the certainty (well, it looks
like a mistaken certainty) that important changes in the Makefile would
be taken up without messing with my configuration options.


Best regards,
Tony.
--
Beware of altruism.  It is based on self-deception, the root of all
evil.

--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
Reply | Threaded
Open this post in threaded view
|

Re: Local mods in src/Makefile unduly taken up in public repository

Bram Moolenaar

Tony Mechelynck wrote:

> At revision f60a0c9cbe6c (Add blowfish encryption), the following
> changes (among others) were included in the src/Makefile:
>
> @@ -467,9 +467,9 @@
>   #CONF_OPT_FEAT = --with-features=tiny
>   #CONF_OPT_FEAT = --with-features=small
>   #CONF_OPT_FEAT = --with-features=normal
>   #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".
>   #CONF_OPT_COMPBY = "--with-compiledby=John Doe <[hidden email]>"
>
> @@ -535,11 +535,11 @@
>   #CFLAGS = -g -DDEBUG -Wall -Wshadow -Wmissing-prototypes
>   #CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce
> -Wall -Wmissing-prototypes
>
>   # Use this with GCC to check for mistakes, unused arguments, etc.
> -#CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code
> -D_FORTIFY_SOURCE=1
> -#PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
> -#MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code -Wno-unused-parameter
> +CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code
> -D_FORTIFY_SOURCE=1
> +PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
> +MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code -Wno-unused-parameter
>
>   # EFENCE - Electric-Fence malloc debugging: catches memory accesses beyond
>   # allocated memory (and makes every malloc()/free() very slow).
>   # Electric Fence is free (search ftp sites).
>
>
> I'm not sure about the meaning of the second hunk, but the first hunk,
> which sets "huge" features without checking anything, is obviously
> something which was left in by error.
>
> I routinely compile two Vim versions with different featuresets, and
> until this change I could replace the copies in the Makefile in the
> shadow directories by soft links, with the certainty (well, it looks
> like a mistaken certainty) that important changes in the Makefile would
> be taken up without messing with my configuration options.

Sorry about that, got included together with the other changes.
I'll back it out.

--
hundred-and-one symptoms of being an internet addict:
58. You turn on your computer and turn off your wife.

 /// Bram Moolenaar -- [hidden email] -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php