In metaconfig.git, the branch master has been updated <http://perl5.git.perl.org/metaconfig.git/commitdiff/dd5ddbc88d3197c4561d8206d91012646944335d?hp=f3eeb0557b2e00d9a1e5a413cfa4693481e4cf4e>
- Log ----------------------------------------------------------------- commit dd5ddbc88d3197c4561d8206d91012646944335d Author: H.Merijn Brand - Tux <[email protected]> Date: Wed Mar 12 10:46:57 2014 +0100 Finish backporting hugmeir's work The tryp<space>" change is to work around a bug in metalint/metaconfig ----------------------------------------------------------------------- Summary of changes: U/perl/Cross.U | 6 +++++- U/perl/fflushall.U | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/U/perl/Cross.U b/U/perl/Cross.U index ff052ea..de960ea 100644 --- a/U/perl/Cross.U +++ b/U/perl/Cross.U @@ -103,6 +103,7 @@ ?LINT:change nm ?LINT:change ranlib ?LINT:change src +?LINT:extern targetenv ?LINT:extern targetport ?LINT:extern targetdir ?LINT:extern targetuser @@ -126,11 +127,14 @@ ?LINT:extern hostosname ?LINT:extern multiarch : Check for Cross-Compilation -?X: targethost mainly set to allow ?S: documentation +?X: targethost and targetenv mainly set to allow ?S: documentation ?X:otherwise it could have been declared extern if $test "X$targethost" = "X"; then targethost="" fi +if $test "X$targetenv" = "X"; then + targetenv="" +fi case "$usecrosscompile" in $define|true|[yY]*) $echo "Cross-compiling..." diff --git a/U/perl/fflushall.U b/U/perl/fflushall.U index 11393d9..208f384 100644 --- a/U/perl/fflushall.U +++ b/U/perl/fflushall.U @@ -202,9 +202,9 @@ EOCP if $test "X$targethost" != X; then $to tryp.c $to tryp - $run "cat tryp.c | ./tryp" 2>/dev/null > tryp.out + $run "cat tryp.c | ./tryp " 2>/dev/null > tryp.out else - $cat tryp.c | $run ./tryp 2>/dev/null > tryp.out + $cat tryp.c | $run ./tryp 2>/dev/null > tryp.out fi if cmp tryp.c tryp.out >/dev/null 2>&1; then $cat >&4 <<EOM @@ -272,9 +272,9 @@ EOCP if $test "X$targethost" != X; then $to tryp.c $to tryp - $run "cat tryp.c | ./tryp" 2>/dev/null > tryp.out + $run "cat tryp.c | ./tryp " 2>/dev/null > tryp.out else - $cat tryp.c | $run ./tryp 2>/dev/null > tryp.out + $cat tryp.c | $run ./tryp 2>/dev/null > tryp.out fi if cmp tryp.c tryp.out >/dev/null 2>&1; then $cat >&4 <<EOM -- perl5 metaconfig repository
