From ccc2aad8d8e6103f3ad40cea21552777ca27f419 Mon Sep 17 00:00:00 2001 From: Gurusamy Sarathy Date: Sat, 11 Mar 2000 16:01:03 +0000 Subject: [PATCH] VMS build tweaks (from Charles Bailey) p4raw-id: //depot/perl@5647 --- configure.com | 3 +-- perl.c | 2 +- t/pragma/warn/doio | 6 +++--- t/pragma/warn/util | 6 +++--- vms/subconfigure.com | 47 ++++++++++++++++++++++++++++++++++++++--------- 5 files changed, 46 insertions(+), 18 deletions(-) diff --git a/configure.com b/configure.com index 8b35193..84ac265 100644 --- a/configure.com +++ b/configure.com @@ -30,8 +30,7 @@ $! with much valuable help from Charles Bailey & $! the whole VMSPerl crew. $! Extended and messed about with by Dan Sugalski $! -$! SET NOVERIFY -$ sav_ver = F$VERIFY(sav_ver) +$ sav_ver = F$VERIFY(0) $! $! VMS-isms we will need: $ echo = "write sys$output " diff --git a/perl.c b/perl.c index 715f4da..f26acb4 100644 --- a/perl.c +++ b/perl.c @@ -3402,8 +3402,8 @@ S_incpush(pTHX_ char *p, int addsubdirs, int addoldvers) av_push(GvAVn(PL_incgv), newSVsv(subdir)); } - if (addoldvers) { #ifdef PERL_INC_VERSION_LIST + if (addoldvers) { for (incver = incverlist; *incver; incver++) { /* .../xxx if -d .../xxx */ Perl_sv_setpvf(aTHX_ subdir, "%"SVf"/%s", libdir, *incver); diff --git a/t/pragma/warn/doio b/t/pragma/warn/doio index 57dd993..bd40972 100644 --- a/t/pragma/warn/doio +++ b/t/pragma/warn/doio @@ -156,7 +156,7 @@ Can't exec "lskdjfalksdjfdjfkls(:? abc)?": .+ ######## # doio.c [Perl_nextargv] $^W = 0 ; -my $filename = "./temp" ; +my $filename = "./temp.dir" ; mkdir $filename, 0777 or die "Cannot create directory $filename: $!\n" ; { @@ -178,8 +178,8 @@ mkdir $filename, 0777 } rmdir $filename ; EXPECT -Can't do inplace edit: ./temp is not a regular file at - line 9. -Can't do inplace edit: ./temp is not a regular file at - line 21. +Can't do inplace edit: ./temp.dir is not a regular file at - line 9. +Can't do inplace edit: ./temp.dir is not a regular file at - line 21. ######## # doio.c [Perl_do_eof] diff --git a/t/pragma/warn/util b/t/pragma/warn/util index 6c9bc8c..e82d6a6 100644 --- a/t/pragma/warn/util +++ b/t/pragma/warn/util @@ -14,7 +14,7 @@ Binary number > 0b11111111111111111111111111111111 non-portable $a = oct "0b111111111111111111111111111111111" ; Integer overflow in octal number - my $a = oct "0777777777777777777777777777777777777777777777777" ; + my $a = oct "077777777777777777777777777777" ; Octal number > 037777777777 non-portable $a = oct "0047777777777" ; Integer overflow in hexadecimal number @@ -65,9 +65,9 @@ Integer overflow in hexadecimal number at - line 3. ######## # util.c use warnings 'overflow' ; -my $a = oct "0777777777777777777777777777777777777777777777777" ; +my $a = oct "077777777777777777777777777777" ; no warnings 'overflow' ; -$a = oct "0777777777777777777777777777777777777777777777777" ; +$a = oct "077777777777777777777777777777" ; EXPECT Integer overflow in octal number at - line 3. ######## diff --git a/vms/subconfigure.com b/vms/subconfigure.com index 9b01a69..d9231e7 100644 --- a/vms/subconfigure.com +++ b/vms/subconfigure.com @@ -67,6 +67,14 @@ $ myname = myhostname $ if "''myname'" .eqs. "" THEN myname = f$trnlnm("SYS$NODE") $! $! ##ADD NEW CONSTANTS HERE## +$ perl_shmattype = "" +$ perl_mmaptype = "" +$ perl_gidformat = "lu" +$ perl_gidsize = "4" +$ perl_groupstype = "Gid_t" +$ perl_stdio_stream_array = "" +$ perl_uidformat = "lu" +$ perl_uidsize = "4" $ perl_d_getcwd = "undef" $ perl_d_nv_preserves_uv = "define" $ perl_d_fs_data_s = "undef" @@ -83,12 +91,10 @@ $ perl_i_ustat = "undef" $ perl_d_llseek="undef" $ perl_d_iconv="undef" $ perl_d_madvise="undef" -$ perl_selectminbits=32 -$ perl_d_vendorarch="define" +$ perl_selectminbits="32" +$ perl_d_vendorarch="undef" $ perl_vendorarchexp="" $ perl_d_msync="undef" -$ perl_d_vendorarch="define" -$ perl_vendorarchexp="" $ perl_d_mprotect="undef" $ perl_d_munmap="undef" $ perl_crosscompile="undef" @@ -110,6 +116,7 @@ $ perl_d_fstatvfs="undef" $ perl_usesocks="undef" $ perl_d_vendorlib="undef" $ perl_vendorlibexp="" +$ perl_vendorlib_stem="" $ perl_d_statfsflags="undef" $ perl_i_sysstatvfs="undef" $ perl_i_mntent="undef" @@ -234,6 +241,9 @@ $ perl_d_archlib="define" $ perl_d_bincompat3="undef" $ perl_cppstdin="''Perl_CC'/noobj/preprocess=sys$output sys$input" $ perl_cppminus=" " +$ perl_cpprun="''Perl_CC'/noobj/preprocess=sys$output sys$input" +$ perl_cpplast=" " +$ perl_aphostname="" $ perl_d_castneg="define" $ perl_castflags="0" $ perl_d_chsize="undef" @@ -404,6 +414,7 @@ $ perl_privlibexp="''perl_prefix':[lib]" $ perl_privlib="''perl_prefix':[lib]" $ perl_sitelibexp="''perl_prefix':[lib.site_perl]" $ perl_sitelib="''perl_prefix':[lib.site_perl]" +$ perl_sitelib_stem="''perl_prefix':[lib.site_perl]" $ perl_sizetype="size_t" $ perl_i_sysparam="undef" $ perl_d_void_closedir="define" @@ -472,6 +483,7 @@ $ perl_sPRIx64 = """Lx""" $ perl_d_quad = "define" $ perl_quadtype = "long long" $ perl_uquadtype = "unsigned long long" +$ perl_quadkind = "QUAD_IS_LONG_LONG" $ ELSE $ perl_d_PRIfldbl = "undef" $ perl_d_PRIgldbl = "undef" @@ -486,6 +498,9 @@ $ perl_sPRIu64 = "" $ perl_sPRIo64 = "" $ perl_sPRIx64 = "" $ perl_d_quad = "undef" +$ perl_quadtype = "long" +$ perl_uquadtype = "unsigned long" +$ perl_quadkind = "QUAD_IS_LONG" $ ENDIF $! $! Now some that we build up @@ -3745,6 +3760,8 @@ $ WC "archname='" + perl_archname + "'" $ WC "d_bincompat3='" + perl_d_bincompat3 + "'" $ WC "cppstdin='" + perl_cppstdin + "'" $ WC "cppminus='" + perl_cppminus + "'" +$ WC "cpprun='" + perl_cpprun + "'" +$ WC "cpplast='" + perl_cpplast + "'" $ WC "d_bcmp='" + perl_d_bcmp + "'" $ WC "d_bcopy='" + perl_d_bcopy + "'" $ WC "d_bzero='" + perl_d_bzero + "'" @@ -3767,6 +3784,7 @@ $ WC "d_fsetpos='" + perl_d_fsetpos + "'" $ WC "d_gettimeod='" + perl_d_gettimeod + "'" $ WC "d_getgrps='" + perl_d_getgrps + "'" $ WC "d_setgrps='" + perl_d_setgrps + "'" +$ WC "groupstype='" + perl_groupstype + "'" $ WC "d_uname='" + perl_d_uname + "'" $ WC "d_getprior='" + perl_d_getprior + "'" $ WC "d_killpg='" + perl_d_killpg + "'" @@ -3800,6 +3818,7 @@ $ WC "d_setruid='" + perl_d_setruid + "'" $ WC "d_setsid='" + perl_d_setsid + "'" $ WC "d_shm='" + perl_d_shm + "'" $ WC "d_shmatprototype='" + perl_d_shmatprototype + "'" +$ WC "shmattype='" + perl_shmattype + "'" $ WC "d_sigaction='" + perl_d_sigaction + "'" $ WC "d_statblks='" + perl_d_statblks + "'" $ WC "stdio_ptr='" + perl_stdio_ptr + "'" @@ -3868,6 +3887,7 @@ $ WC "i_vfork='" + perl_i_vfork + "'" $ WC "prototype='" + perl_prototype + "'" $ WC "randbits='" + perl_randbits +"'" $ WC "selecttype='" + perl_selecttype + "'" +$ WC "selectminbits='" + perl_selectminbits + "'" $ WC "stdchar='" + perl_stdchar + "'" $ WC "d_unlink_all_versions='" + perl_d_unlink_all_versions + "'" $ WC "full_sed='" + perl_full_sed + "'" @@ -3931,6 +3951,7 @@ $ WC "privlibexp='" + perl_privlibexp + "'" $ WC "privlib='" + perl_privlib + "'" $ WC "sitelibexp='" + perl_sitelibexp + "'" $ WC "sitelib='" + perl_sitelib + "'" +$ WC "sitelib_stem='" + perl_sitelib_stem + "'" $ WC "sitearchexp='" + perl_sitearchexp + "'" $ WC "sitearch='" + perl_sitearch + "'" $ WC "sizetype='" + perl_sizetype + "'" @@ -3980,9 +4001,15 @@ $ tempstring = "PATCHLEVEL='" + "''perl_patchlevel'" + "'" $ WC tempstring $ tempstring = "SUBVERSION='" + "''perl_SUBVERSION'" + "'" $ WC tempstring +$ WC "xs_apiversion='" + localperlver + "'" +$ WC "pm_apiversion='" + localperlver + "'" $ WC "pager='" + perl_pager + "'" $ WC "uidtype='" + perl_uidtype + "'" +$ WC "uidformat='" + perl_uidformat + "'" +$ WC "uidsize='" + perl_uidsize + "'" $ WC "gidtype='" + perl_gidtype + "'" +$ WC "gidformat='" + perl_gidformat + "'" +$ WC "gidsize='" + perl_gidsize + "'" $ WC "usethreads='" + perl_usethreads + "'" $ WC "d_pthread_yield='" + perl_d_pthread_yield + "'" $ WC "d_pthreads_created_joinable='" + perl_d_pthreads_created_joinable + "'" @@ -4056,6 +4083,7 @@ $ WC "d_mknod='" + perl_d_mknod + "'" $ WC "devtype='" + perl_devtype + "'" $ WC "d_gethname='" + perl_d_gethname + "'" $ WC "d_phostname='" + perl_d_phostname + "'" +$ WC "aphostname='" + perl_aphostname + "'" $ WC "d_accessx='" + perl_d_accessx + "'" $ WC "d_eaccess='" + perl_d_eaccess + "'" $ WC "i_ieeefp='" + perl_i_ieeefp + "'" @@ -4104,6 +4132,7 @@ $ WC "d_statfsflags='" + perl_d_statfsflags + "'" $ WC "fflushNULL='define'" $ WC "fflushall='undef'" $ WC "d_stdio_stream_array='undef'" +$ WC "stdio_stream_array='" + perl_stdio_stream_array + "'" $ WC "i_sysstatvfs='" + perl_i_sysstatvfs + "'" $ WC "i_syslog='" + perl_i_syslog + "'" $ WC "i_sysmode='" + perl_i_sysmode + "'" @@ -4120,6 +4149,7 @@ $ WC "d_msync='" + perl_d_msync + "'" $ WC "d_mprotect='" + perl_d_mprotect + "'" $ WC "d_munmap='" + perl_d_munmap + "'" $ WC "d_mmap='" + perl_d_mmap + "'" +$ WC "mmaptype='" + perl_mmaptype + "'" $ WC "i_sysmman='" + perl_i_sysmman + "'" $ WC "installusrbinperl='" + perl_installusrbinperl + "'" $! WC "selectminbits='" + perl_selectminbits + "'" @@ -4133,6 +4163,7 @@ $ WC "d_strtold='" + perl_d_strtold + "'" $ WC "usesocks='" + perl_usesocks + "'" $ WC "d_vendorlib='" + perl_d_vendorlib + "'" $ WC "vendorlibexp='" + perl_vendorlibexp + "'" +$ WC "vendorlib_stem='" + perl_vendorlib_stem + "'" $ WC "d_atolf='" + perl_d_atolf + "'" $ WC "d_atoll='" + perl_d_atoll + "'" $ WC "d_bincompat5005='" + perl_d_bincompat + "'" @@ -4163,11 +4194,9 @@ $ WC "uselargefiles='" + perl_uselargefiles + "'" $ WC "uselongdouble='" + perl_uselongdouble + "'" $ WC "usemorebits='" + perl_usemorebits + "'" $ WC "d_quad='" + perl_d_quad + "'" -$ IF (use64bitint) -$ THEN -$ WC "quadtype='" + perl_quadtype + "'" -$ WC "uquadtype='" + perl_uquadtype + "'" -$ ENDIF +$ WC "quadtype='" + perl_quadtype + "'" +$ WC "uquadtype='" + perl_uquadtype + "'" +$ WC "quadkind='" + perl_quadkind + "'" $ WC "d_fs_data_s='" + perl_d_fs_data_s + "'" $ WC "d_getcwd='" + perl_d_getcwd + "'" $ WC "d_getmnt='" + perl_d_getmnt + "'" -- 2.7.4