In metaconfig.git, the branch master has been updated <http://perl5.git.perl.org/metaconfig.git/commitdiff/cfa27319cc1cd542079a70846d7f0c255a2e4340?hp=8f330a830bffb7d54d364eb686a1e00596e945ba>
- Log ----------------------------------------------------------------- commit cfa27319cc1cd542079a70846d7f0c255a2e4340 Author: H.Merijn Brand - Tux <[email protected]> Date: Thu Apr 21 15:17:23 2016 +0200 Stuff missed in previous commits M U/compline/d_siginfo_si.U M U/modified/Options.U commit 24a76723e30df31ea096e008322a80e6f33a6654 Author: H.Merijn Brand - Tux <[email protected]> Date: Thu Apr 21 14:04:43 2016 +0200 Make -O behavior the default Backport of 41d73075f0801c26794dadb1ff690f305d7e53a7 Author: Ivan Pozdeev <[email protected]> Date: Wed Aug 12 20:33:12 2015 +0300 and the later update commit 7a4fcb3f64df51eacf89f69a4bf76386aea1e8e3 Author: Aaron Crane <[email protected]> Date: Wed Dec 2 00:06:42 2015 +0000 Configure: unbreak -S option now that -O is the default As far as I can tell, using the -S and -O options together has always yielded an error of this form: Configure: 2042: .: Can't open ./optdef.sh That's because, even though optdef.sh is created in the UU directory, and most of Configure is run in that directory, part of the -S implementation is run in the root directory, and was therefore trying to read ./optdef.sh instead of ./UU/optdef.sh. As of 41d73075f0801c26794dadb1ff690f305d7e53a7, the -O mode is always enabled, so the -S option has been broken since then. This fixes that. A U/modified/Extractall.U M U/modified/Oldconfig.U M U/modified/Options.U ----------------------------------------------------------------------- Summary of changes: U/compline/d_siginfo_si.U | 7 ------- {dist/U => U/modified}/Extractall.U | 3 ++- U/modified/Oldconfig.U | 2 +- U/modified/Options.U | 6 +++--- 4 files changed, 6 insertions(+), 12 deletions(-) copy {dist/U => U/modified}/Extractall.U (95%) diff --git a/U/compline/d_siginfo_si.U b/U/compline/d_siginfo_si.U index efe43e2..dcd0c5e 100644 --- a/U/compline/d_siginfo_si.U +++ b/U/compline/d_siginfo_si.U @@ -69,13 +69,6 @@ ?H:#$d_siginfo_si_band HAS_SIGINFO_SI_BAND /**/ ?H:#$d_siginfo_si_value HAS_SIGINFO_SI_VALUE /**/ ?H:. -?LINT:set d_siginfo_si_errno -?LINT:set d_siginfo_si_pid -?LINT:set d_siginfo_si_uid -?LINT:set d_siginfo_si_addr -?LINT:set d_siginfo_si_status -?LINT:set d_siginfo_si_band -?LINT:set d_siginfo_si_value : see what siginfo fields we have case "$d_sigaction" in "$define") diff --git a/dist/U/Extractall.U b/U/modified/Extractall.U similarity index 95% copy from dist/U/Extractall.U copy to U/modified/Extractall.U index 4686fd4..b4239db 100644 --- a/dist/U/Extractall.U +++ b/U/modified/Extractall.U @@ -39,7 +39,8 @@ true) echo "Fetching answers from $config_sh..." cd .. . $config_sh - test "$override" && . ./optdef.sh +?X: extract has to be run from the top directory, not within UU. + . UU/optdef.sh echo " " ?X: extract has to be run from the top directory, not within UU. . UU/extract diff --git a/U/modified/Oldconfig.U b/U/modified/Oldconfig.U index 2937a6b..7d882a8 100644 --- a/U/modified/Oldconfig.U +++ b/U/modified/Oldconfig.U @@ -700,7 +700,7 @@ fi hint=previous ;; esac -test "$override" && . ./optdef.sh +. ./optdef.sh : Restore computed paths for file in $loclist $trylist; do diff --git a/U/modified/Options.U b/U/modified/Options.U index a3f77ac..db34462 100644 --- a/U/modified/Options.U +++ b/U/modified/Options.U @@ -199,7 +199,7 @@ while test $# -gt 0; do -s) shift; silent=true; realsilent=true;; -E) shift; alldone=exit;; -K) shift; knowitall=true;; - -O) shift; override=true;; + -O) shift;; -S) shift; silent=true; extractsh=true;; -D) shift @@ -308,7 +308,7 @@ Usage: $me [-dehrsEKOSV] [-f config.sh] [-D symbol] [-D symbol=value] -Dprefix=/opt/perl5 choose your destination -E : stop at the end of questions, after having produced config.sh. -K : do not use unless you know what you are doing. - -O : let -D and -U override definitions from loaded configuration file. + -O : ignored for backward compatibility -S : perform variable substitutions on all .SH files (can mix with -f) -U : undefine symbol: -U symbol symbol gets the value 'undef' @@ -370,7 +370,7 @@ esac touch optdef.sh ?X: -q is POSIX ?X: It does not work in SysV (solaris) or old BSD greps. -grep '\\' optdef.sh +grep '\\' optdef.sh >/dev/null 2>&1 if test $? = 0; then echo "Configure does not support \\ in -D arguments" exit 1 -- perl5 metaconfig repository
