In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/f53a6e0ea91f342c0645d72c1c6cfbd044b1794b?hp=f0081f64cc268c6765e7cdc0539513842b398eb3>
- Log ----------------------------------------------------------------- commit f53a6e0ea91f342c0645d72c1c6cfbd044b1794b Author: H.Merijn Brand <[email protected]> Date: Wed Mar 12 11:00:00 2014 +0100 Backport/genererate work from cross-port At the "Perl5 and beyond" hackathon early feb 2014 in Amsterdam, hugmeir and I walked through all the changes and ended up with a serious warning in metalint where we stopped. The warning proved to be a bug in metalint that will be fixed in the future and has a rather easy workaround. Porting/Glossary is not yet being generated correctly. Will take care of that later. ----------------------------------------------------------------------- Summary of changes: Configure | 44 ++++++++++++++++++++++++-------------------- config_h.SH | 26 +++++++++++++------------- uconfig.h | 26 +++++++++++++------------- 3 files changed, 50 insertions(+), 46 deletions(-) diff --git a/Configure b/Configure index 88ff021..8a56092 100755 --- a/Configure +++ b/Configure @@ -28,7 +28,7 @@ # See Porting/pumpkin.pod for more information on metaconfig. # -# Generated on Wed Jan 22 12:03:46 CET 2014 [metaconfig 3.5 PL0] +# Generated on Wed Mar 12 10:48:15 CET 2014 [metaconfig 3.5 PL0] # (with additional metaconfig patches by [email protected]) cat >c1$$ <<EOF @@ -206,6 +206,9 @@ ccsymbols='' cppccsymbols='' cppsymbols='' from='' +hostgenerate='' +hostosname='' +hostperl='' run='' targetarch='' targetdir='' @@ -215,10 +218,6 @@ targetmkdir='' targetport='' to='' usecrosscompile='' -hostperl='' -hostgenerate='' -hostosname='' -targetsh='' extern_C='' mistrustnm='' usedevel='' @@ -1168,6 +1167,7 @@ scriptdirexp='' selectminbits='' selecttype='' sh='' +targetsh='' sig_count='' sig_name='' sig_name_init='' @@ -2841,6 +2841,9 @@ esac 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..." @@ -2887,13 +2890,14 @@ $define|true|[yY]*) cd .. cd $src src=`pwd` - test -d $src/host || mkdir $src/host - cd $src/host && rm -rf ./* + rm -rf $src/host + mkdir $src/host + cd $src/host $src/Configure -des -Dusedevel -Dmksymlinks $make miniperl case "$hostgenerate" in '') $make generate_uudmap - hostgenerate=$src/host/generate_uudmap + hostgenerate=$src/host/generate_uudmap ;; "$undef") hostgenerate='' ;; @@ -3029,11 +3033,11 @@ do case "\$f" in /*) $targetmkdir \`dirname \$f\` - $targetto -P $targetport -r $q \$f $targetuser@$targethost:\$f || exit 1 + $targetto -P $targetport -r $q \$f $targetuser@$targethost:\$f 2>/dev/null || exit 1 ;; *) $targetmkdir $targetdir/\`dirname \$f\` - $targetto -P $targetport -r $q \$f $targetuser@$targethost:$targetdir/\$f 2>/dev/null || exit 1 + $targetto -P $targetport -r $q \$f $targetuser@$targethost:$targetdir/\$f 2>/dev/null || exit 1 ;; esac done @@ -3574,8 +3578,8 @@ EOM esac ;; *) - osname=`echo $targetarch|sed 's,^[^-]*-,,'` - osvers='' + osname=`echo $targetarch|sed 's,^[^-]*-,,'` + osvers='' ;; esac ;; @@ -19731,9 +19735,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 @@ -19800,10 +19804,10 @@ EOCP $rm -f tryp.out if $test "X$targethost" != X; then $to tryp.c - $to tryp - $run "cat tryp.c | ./tryp" 2>/dev/null > tryp.out + $to tryp + $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 @@ -23482,13 +23486,13 @@ h_fcntl='$h_fcntl' h_sysfile='$h_sysfile' hint='$hint' hostcat='$hostcat' +hostgenerate='$hostgenerate' +hostosname='$hostosname' +hostperl='$hostperl' html1dir='$html1dir' html1direxp='$html1direxp' html3dir='$html3dir' html3direxp='$html3direxp' -hostgenerate='$hostgenerate' -hostperl='$hostperl' -hostosname='$hostosname' i16size='$i16size' i16type='$i16type' i32size='$i32size' diff --git a/config_h.SH b/config_h.SH index c027ac4..640d0a2 100755 --- a/config_h.SH +++ b/config_h.SH @@ -901,18 +901,6 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un #define OSNAME "$osname" /**/ #define OSVERS "$osvers" /**/ -/* USE_CROSS_COMPILE: - * This symbol, if defined, indicates that Perl is being cross-compiled. - */ -/* PERL_TARGETARCH: - * This symbol, if defined, indicates the target architecture - * Perl has been cross-compiled to. Undefined if not a cross-compile. - */ -#ifndef USE_CROSS_COMPILE -#$usecrosscompile USE_CROSS_COMPILE /**/ -#define PERL_TARGETARCH "$targetarch" /**/ -#endif - /* MULTIARCH: * This symbol, if defined, signifies that the build * process will produce some binary files that are going to be @@ -3141,7 +3129,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un * /bin/pdksh, /bin/ash, /bin/bash, or even something such as * D:/bin/sh.exe. */ -#define SH_PATH "$targetsh" /**/ +#define SH_PATH "$sh" /**/ /* SIG_NAME: * This symbol contains a list of signal names in order of @@ -3359,6 +3347,18 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un #$i_termios I_TERMIOS /**/ #$i_sgtty I_SGTTY /**/ +/* USE_CROSS_COMPILE: + * This symbol, if defined, indicates that Perl is being cross-compiled. + */ +/* PERL_TARGETARCH: + * This symbol, if defined, indicates the target architecture + * Perl has been cross-compiled to. Undefined if not a cross-compile. + */ +#ifndef USE_CROSS_COMPILE +#$usecrosscompile USE_CROSS_COMPILE /**/ +#define PERL_TARGETARCH "$targetarch" /**/ +#endif + /* PERL_USE_DEVEL: * This symbol, if defined, indicates that Perl was configured with * -Dusedevel, to enable development features. This should not be diff --git a/uconfig.h b/uconfig.h index 74f9860..2624530 100644 --- a/uconfig.h +++ b/uconfig.h @@ -866,18 +866,6 @@ #define OSNAME "unknown" /**/ #define OSVERS "unknown" /**/ -/* USE_CROSS_COMPILE: - * This symbol, if defined, indicates that Perl is being cross-compiled. - */ -/* PERL_TARGETARCH: - * This symbol, if defined, indicates the target architecture - * Perl has been cross-compiled to. Undefined if not a cross-compile. - */ -#ifndef USE_CROSS_COMPILE -/*#define USE_CROSS_COMPILE / **/ -#define PERL_TARGETARCH "" /**/ -#endif - /* MULTIARCH: * This symbol, if defined, signifies that the build * process will produce some binary files that are going to be @@ -3324,6 +3312,18 @@ /*#define I_TERMIOS / **/ /*#define I_SGTTY / **/ +/* USE_CROSS_COMPILE: + * This symbol, if defined, indicates that Perl is being cross-compiled. + */ +/* PERL_TARGETARCH: + * This symbol, if defined, indicates the target architecture + * Perl has been cross-compiled to. Undefined if not a cross-compile. + */ +#ifndef USE_CROSS_COMPILE +/*#define USE_CROSS_COMPILE / **/ +#define PERL_TARGETARCH "" /**/ +#endif + /* PERL_USE_DEVEL: * This symbol, if defined, indicates that Perl was configured with * -Dusedevel, to enable development features. This should not be @@ -4718,6 +4718,6 @@ #endif /* Generated from: - * cdad09dc550db3784fa27db0f3cc6e1c1644e496c430e464d143bc725c327a53 config_h.SH + * 986d2349e078df67f02d5b9747b7fe65abb0d2875fb52a836138919aafe08545 config_h.SH * ac5e1b20c67628ee909f09737452ab1878a99053c728e3e7746c23c7b8a0d037 uconfig.sh * ex: set ro: */ -- Perl5 Master Repository
