From c9db53f47fcab6bc813d34e149444282f9aef29c Mon Sep 17 00:00:00 2001 From: Aaron Crane Date: Sat, 14 Oct 2017 17:01:19 +0200 Subject: [PATCH] Don't pretend to determine whether ansi2knr is needed --- Configure | 70 +++++++++++----------------------- Cross/cflags-cross-arm | 1 - Cross/config.sh-arm-linux | 1 - Cross/config.sh-arm-linux-n770 | 1 - NetWare/config.wc | 1 - Porting/Glossary | 4 -- Porting/config.sh | 1 - cflags.SH | 1 - plan9/config_sh.sample | 1 - uconfig64.sh | 1 - win32/config.ce | 1 - win32/config.gc | 1 - win32/config.vc | 1 - 13 files changed, 22 insertions(+), 63 deletions(-) diff --git a/Configure b/Configure index 4e3b964e93bb..5c7853bb8dab 100755 --- a/Configure +++ b/Configure @@ -336,7 +336,6 @@ rm_try='' afs='' afsroot='' alignbytes='' -ansi2knr='' archlib='' archlibexp='' d_archlib='' @@ -8105,52 +8104,6 @@ esac set d_perl_otherlibdirs eval $setvar -: Cruising for prototypes -echo " " -echo "Checking out function prototypes..." >&4 -$cat >prototype.c < -#endif -int main(int argc, char *argv[]) { - exit(0);} -EOCP -if $cc $ccflags -c prototype.c >prototype.out 2>&1 ; then - echo "Your C compiler appears to support function prototypes." - val="$define" -else - echo "Your C compiler doesn't seem to understand function prototypes." - val="$undef" -fi -set prototype -eval $setvar -$rm -f prototype* - -: Check if ansi2knr is required -case "$prototype" in -"$define") ;; -*) ansi2knr='ansi2knr' - echo " " - cat <&4 - -$me: FATAL ERROR: -This version of $package can only be compiled by a compiler that -understands function prototypes. Unfortunately, your C compiler - $cc $ccflags -doesn't seem to understand them. Sorry about that. - -If GNU cc is available for your system, perhaps you could try that instead. - -Eventually, we hope to support building Perl with pre-ANSI compilers. -If you would like to help in that effort, please contact . - -Aborting Configure now. -EOM - exit 2 - ;; -esac - : DTrace support dflt_dtrace='/usr/sbin/dtrace' $test -x /usr/bin/dtrace && dflt_dtrace='/usr/bin/dtrace' @@ -10789,6 +10742,28 @@ eval $inlibc set asctime64 d_asctime64 eval $inlibc +: Cruising for prototypes +echo " " +echo "Checking out function prototypes..." >&4 +$cat >prototype.c < +#endif +int main(int argc, char *argv[]) { + exit(0);} +EOCP +if $cc $ccflags -c prototype.c >prototype.out 2>&1 ; then + echo "Your C compiler appears to support function prototypes." + val="$define" +else + echo "Your C compiler doesn't seem to understand function prototypes." + val="$undef" +fi +set prototype +eval $setvar +$rm -f prototype* + : see if POSIX threads are available set pthread.h i_pthread eval $inhdr @@ -24120,7 +24095,6 @@ _o='$_o' afs='$afs' afsroot='$afsroot' alignbytes='$alignbytes' -ansi2knr='$ansi2knr' aphostname='$aphostname' api_revision='$api_revision' api_subversion='$api_subversion' diff --git a/Cross/cflags-cross-arm b/Cross/cflags-cross-arm index 3006394e4cc9..2fa2a45b8eec 100644 --- a/Cross/cflags-cross-arm +++ b/Cross/cflags-cross-arm @@ -148,7 +148,6 @@ if test -f .patch; then ccflags="-DPERL_PATCHNUM=`cat .patch` $ccflags" fi - : Can we perhaps use $ansi2knr here echo "$CROSSCC -c -DUSE_CROSS_COMPILE -DPERL_CORE $ccflags $stdflags $optimize $warn $extra" eval "$also "'"$CROSSCC -DUSE_CROSS_COMPILE -DPERL_CORE -c $ccflags $stdflags $optimize $warn $extra"' diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux index d9ea73957dc5..aac122166d2b 100644 --- a/Cross/config.sh-arm-linux +++ b/Cross/config.sh-arm-linux @@ -29,7 +29,6 @@ _o='.o' afs='false' afsroot='/afs' alignbytes='4' -ansi2knr='' aphostname='/bin/hostname' api_revision='5' api_subversion='6' diff --git a/Cross/config.sh-arm-linux-n770 b/Cross/config.sh-arm-linux-n770 index 781e90806e27..a9e9c24489cb 100644 --- a/Cross/config.sh-arm-linux-n770 +++ b/Cross/config.sh-arm-linux-n770 @@ -29,7 +29,6 @@ _o='.armo' afs='false' afsroot='/afs' alignbytes='4' -ansi2knr='' aphostname='/bin/hostname' api_revision='5' api_subversion='6' diff --git a/NetWare/config.wc b/NetWare/config.wc index a50ee8feeeed..8e3b475f02ef 100644 --- a/NetWare/config.wc +++ b/NetWare/config.wc @@ -18,7 +18,6 @@ _nlp='.nlp' _o='.obj' afs='false' alignbytes='8' -ansi2knr='' aphostname='' api_revision='~PERL_API_REVISION~' api_subversion='~PERL_API_SUBVERSION~' diff --git a/Porting/Glossary b/Porting/Glossary index 4007c44cb949..6d964ae79b8f 100644 --- a/Porting/Glossary +++ b/Porting/Glossary @@ -41,10 +41,6 @@ alignbytes (alignbytes.U): double-- or a long double when applicable. Usual values are 2, 4 and 8. The default is eight, for safety. -ansi2knr (ansi2knr.U): - This variable is set if the user needs to run ansi2knr. - Currently, this is not supported, so we just abort. - aphostname (d_gethname.U): This variable contains the command which can be used to compute the host name. The command is fully qualified by its absolute path, to make diff --git a/Porting/config.sh b/Porting/config.sh index d8c7a4d0253b..d534584f02e3 100644 --- a/Porting/config.sh +++ b/Porting/config.sh @@ -36,7 +36,6 @@ _o='.o' afs='false' afsroot='/afs' alignbytes='8' -ansi2knr='' aphostname='/bin/hostname' api_revision='5' api_subversion='6' diff --git a/cflags.SH b/cflags.SH index c2a529b147c9..c9b34e084b05 100755 --- a/cflags.SH +++ b/cflags.SH @@ -527,7 +527,6 @@ for file do toke) optimize=-O0 ;; esac - # Can we perhaps use $ansi2knr here echo "$cc -c -DPERL_CORE $ccflags $stdflags $optimize $warn $extra" . $TOP/config.sh diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample index 362193a70010..f0f38fca1280 100644 --- a/plan9/config_sh.sample +++ b/plan9/config_sh.sample @@ -29,7 +29,6 @@ _o='.o' afs='false' afsroot='/afs' alignbytes='4' -ansi2knr='' aphostname='/bin/uname -n' api_revision='5' api_subversion='6' diff --git a/uconfig64.sh b/uconfig64.sh index 45dde39bdbfe..3e8d3255a47f 100644 --- a/uconfig64.sh +++ b/uconfig64.sh @@ -5,7 +5,6 @@ _o='.o' afs='false' afsroot='/afs' alignbytes='8' -ansi2knr='' aphostname='/bin/hostname' archlib='/usr/local/lib/perl5/5.27/unknown' archlibexp='/usr/local/lib/perl5/5.27/unknown' diff --git a/win32/config.ce b/win32/config.ce index e974db9be2a2..ccbc0d8221a8 100644 --- a/win32/config.ce +++ b/win32/config.ce @@ -16,7 +16,6 @@ _exe='.exe' _o='.obj' afs='false' alignbytes='8' -ansi2knr='' aphostname='' api_revision='~PERL_API_REVISION~' api_subversion='~PERL_API_SUBVERSION~' diff --git a/win32/config.gc b/win32/config.gc index 1303cdca5f6b..4b6c470aae14 100644 --- a/win32/config.gc +++ b/win32/config.gc @@ -16,7 +16,6 @@ _o='.o' afs='false' afsroot='/afs' alignbytes='8' -ansi2knr='' aphostname='' api_revision='~PERL_API_REVISION~' api_subversion='~PERL_API_SUBVERSION~' diff --git a/win32/config.vc b/win32/config.vc index cba7b69c9fa4..50493cdcbc9f 100644 --- a/win32/config.vc +++ b/win32/config.vc @@ -16,7 +16,6 @@ _o='.obj' afs='false' afsroot='/afs' alignbytes='8' -ansi2knr='' aphostname='' api_revision='~PERL_API_REVISION~' api_subversion='~PERL_API_SUBVERSION~'