In metaconfig.git, the branch master has been updated <http://perl5.git.perl.org/metaconfig.git/commitdiff/6daf2ecdea124579b5d7b35a64b7135bd09fa340?hp=1195953e4884e1af404d2a9d1e301a3a548cf76d>
- Log ----------------------------------------------------------------- commit 6daf2ecdea124579b5d7b35a64b7135bd09fa340 Author: H.Merijn Brand - Tux <[email protected]> Date: Thu Apr 21 15:32:27 2016 +0200 Try to avoid doubling the cppflags if rerun without removing config.sh Backport of 76e6b6c7dc4c93d421dfe6c24866c3cd4560b57a Author: Jarkko Hietaniemi <[email protected]> Date: Fri Oct 16 08:10:40 2015 -0400 Try to avoid doubling the cppflags if rerun without removing config.sh This bug has been here since 2001, introduced by yours truly in 58e77565. Hasn't been too harmful, obviously. It doubles the cppflags only once, thankfully, unlimited doubling would probably have been noticed earlier. The avoidance maneuver is far from fool-proof. To be more fooler-proofer, some sort of order-preserving deduping would be needed. M U/compline/ccflags.U commit 697076350f4ca8f93555e9e7b4e4f05c91e3630f Author: H.Merijn Brand - Tux <[email protected]> Date: Thu Apr 21 15:31:23 2016 +0200 Another small cleanup M U/modified/Options.U ----------------------------------------------------------------------- Summary of changes: U/compline/ccflags.U | 7 ++++++- U/modified/Options.U | 3 +-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/U/compline/ccflags.U b/U/compline/ccflags.U index 4226327..bbd264e 100644 --- a/U/compline/ccflags.U +++ b/U/compline/ccflags.U @@ -323,7 +323,12 @@ esac : the following weeds options from ccflags that are of no interest to cpp case "$cppflags" in '') cppflags="$ccflags" ;; -*) cppflags="$cppflags $ccflags" ;; +*) set X $ccflags; shift + case " $cppflags " in + *" $1 "*) ;; # Try to avoid doubling the cppflags. + *) cppflags="$cppflags $ccflags" ;; + esac + ;; esac case "$gccversion" in 1*) cppflags="$cppflags -D__GNUC__" diff --git a/U/modified/Options.U b/U/modified/Options.U index db34462..087acf9 100644 --- a/U/modified/Options.U +++ b/U/modified/Options.U @@ -46,7 +46,7 @@ ?MAKE:Options: startsh ?MAKE: -pick wipe $@ %< ?V:reuseval alldone error realsilent silent extractsh fastread \ - override knowitall: config_sh + knowitall: config_sh ?T:arg argn symbol config_arg0 config_args config_argc xxx yyy zzz uuu ?T:args_exp args_sep arg_exp ccflags ?F:!Configure @@ -156,7 +156,6 @@ alldone='' error='' silent='' extractsh='' -override='' knowitall='' rm -f optdef.sh posthint.sh cat >optdef.sh <<EOS -- perl5 metaconfig repository
