In metaconfig.git, the branch master has been updated <http://perl5.git.perl.org/metaconfig.git/commitdiff/1cce64a13554d0477c5d7cca025fbe772cdf9668?hp=33487a210986aed17fe5018f9c4da49277965e42>
- Log ----------------------------------------------------------------- commit 1cce64a13554d0477c5d7cca025fbe772cdf9668 Author: H.Merijn Brand - Tux <[email protected]> Date: Sun Nov 13 13:50:07 2016 +0100 promote dist-git rm_try changes to dist/ M dist/U/byteorder.U M dist/U/ccflags.U M dist/U/charsize.U M dist/U/d_casti32.U M dist/U/d_castneg.U M dist/U/d_gconvert.U M dist/U/d_gnulibc.U M dist/U/d_stdstdio.U M dist/U/d_strctcpy.U M dist/U/d_volatile.U M dist/U/doublesize.U M dist/U/ebcdic.U M dist/U/i_db.U M dist/U/i_dirent.U M dist/U/i_neterrno.U M dist/U/i_time.U M dist/U/intsize.U M dist/U/nblock_io.U M dist/U/ptrsize.U M dist/U/voidflags.U commit c16e22dbb0c14b44a2593c48d469641e4426f27d Author: H.Merijn Brand - Tux <[email protected]> Date: Sun Nov 13 13:49:28 2016 +0100 No changes left to keep D U/modified/d_strctcpy.U ----------------------------------------------------------------------- Summary of changes: U/modified/d_strctcpy.U | 53 ------------------------------------------------- dist/U/byteorder.U | 4 ++-- dist/U/ccflags.U | 4 ++-- dist/U/charsize.U | 4 ++-- dist/U/d_casti32.U | 4 ++-- dist/U/d_castneg.U | 4 ++-- dist/U/d_gconvert.U | 4 ++-- dist/U/d_gnulibc.U | 4 ++-- dist/U/d_stdstdio.U | 8 ++++---- dist/U/d_strctcpy.U | 4 ++-- dist/U/d_volatile.U | 4 ++-- dist/U/doublesize.U | 4 ++-- dist/U/ebcdic.U | 4 ++-- dist/U/i_db.U | 6 +++--- dist/U/i_dirent.U | 6 +++--- dist/U/i_neterrno.U | 4 ++-- dist/U/i_time.U | 4 ++-- dist/U/intsize.U | 4 ++-- dist/U/nblock_io.U | 6 +++--- dist/U/ptrsize.U | 4 ++-- dist/U/voidflags.U | 4 ++-- 21 files changed, 45 insertions(+), 98 deletions(-) delete mode 100644 U/modified/d_strctcpy.U diff --git a/U/modified/d_strctcpy.U b/U/modified/d_strctcpy.U deleted file mode 100644 index e6aece6..0000000 --- a/U/modified/d_strctcpy.U +++ /dev/null @@ -1,53 +0,0 @@ -?RCS: $Id: d_strctcpy.U,v 3.0 1993/08/18 12:07:34 ram Exp $ -?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi -?RCS: -?RCS: You may redistribute only under the terms of the Artistic License, -?RCS: as specified in the README file that comes with the distribution. -?RCS: You may reuse parts of this distribution only within the terms of -?RCS: that same Artistic License; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. -?RCS: -?RCS: $Log: d_strctcpy.U,v $ -?RCS: Revision 3.0 1993/08/18 12:07:34 ram -?RCS: Baseline for dist 3.0 netwide release. -?RCS: -?MAKE:d_strctcpy: cat rm_try cc Setvar -?MAKE: -pick add $@ %< -?S:d_strctcpy: -?S: This variable conditionally defines the USE_STRUCT_COPY symbol, which -?S: indicates to the C program that this C compiler knows how to copy -?S: structures. -?S:. -?C:USE_STRUCT_COPY (STRUCTCOPY): -?C: This symbol, if defined, indicates that this C compiler knows how -?C: to copy structures. If undefined, you'll need to use a block copy -?C: routine of some sort instead. -?C:. -?H:#$d_strctcpy USE_STRUCT_COPY /**/ -?H:. -?LINT:set d_strctcpy -: check for structure copying -echo " " -echo "Checking to see if your C compiler can copy structs..." >&4 -$cat >try.c <<'EOCP' -int main() -{ - struct blurfl { - int dyick; - } foo, bar; - - foo = bar; -} -EOCP -if $cc -c try.c >/dev/null 2>&1 ; then - val="$define" - echo "Yup, it can." -else - val="$undef" - echo "Nope, it can't." -fi -set d_strctcpy -eval $setvar -$rm_try - diff --git a/dist/U/byteorder.U b/dist/U/byteorder.U index a52e458..84c89d2 100644 --- a/dist/U/byteorder.U +++ b/dist/U/byteorder.U @@ -7,7 +7,7 @@ ?RCS: that same Artistic License; a copy of which may be found at the root ?RCS: of the source tree for dist 4.0. ?RCS: -?MAKE:byteorder: cat Myread Oldconfig Loc +cc +ccflags rm +?MAKE:byteorder: cat Myread Oldconfig Loc +cc +ccflags rm_try ?MAKE: -pick add $@ %< ?S:byteorder: ?S: This variable holds the byte order. In the following, larger digits @@ -84,5 +84,5 @@ EOM esac ;; esac -$rm -f try.c try +$rm_try diff --git a/dist/U/ccflags.U b/dist/U/ccflags.U index e1e1dac..b8de8e7 100644 --- a/dist/U/ccflags.U +++ b/dist/U/ccflags.U @@ -47,7 +47,7 @@ ?RCS: ?MAKE:ccflags ldflags lkflags cppflags optimize locincpth: test cat \ Myread Guess Options Oldconfig gccversion mips_type +usrinc \ - package contains rm +cc cppstdin cppminus cpprun cpplast libpth \ + package contains rm rm_try +cc cppstdin cppminus cpprun cpplast libpth \ loclibpth hint ?MAKE: -pick add $@ %< ?S:ccflags: @@ -416,5 +416,5 @@ y) ;; n) echo "OK, that should do.";; esac -$rm -f try try.* core +$rm_try diff --git a/dist/U/charsize.U b/dist/U/charsize.U index f69fea7..ae3cd8b 100644 --- a/dist/U/charsize.U +++ b/dist/U/charsize.U @@ -15,7 +15,7 @@ ?RCS: Revision 3.0 1993/08/18 12:05:34 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:charsize: Assert Myread cat rm +cc +ccflags echo n c +?MAKE:charsize: Assert Myread cat rm_try +cc +ccflags echo n c ?MAKE: -pick add $@ %< ?S:charsize: ?S: This variable contains the value of the CHARSIZE symbol, which @@ -60,5 +60,5 @@ error) charsize=$size ;; esac -$rm -f try.* +$rm_try diff --git a/dist/U/d_casti32.U b/dist/U/d_casti32.U index 7641da8..6363761 100644 --- a/dist/U/d_casti32.U +++ b/dist/U/d_casti32.U @@ -23,7 +23,7 @@ ?X: ?X: Can the compiler cast large floats to 32-bit integers? ?X: -?MAKE:d_casti32: cat +cc +ccflags rm intsize Setvar test signal_t +?MAKE:d_casti32: cat +cc +ccflags rm_try intsize Setvar test signal_t ?MAKE: -pick add $@ %< ?S:d_casti32: ?S: This variable conditionally defines CASTI32, which indicates @@ -83,5 +83,5 @@ case "$yyy" in esac set d_casti32 eval $setvar -$rm -f try try.* +$rm_try diff --git a/dist/U/d_castneg.U b/dist/U/d_castneg.U index be8ae0e..517ac1c 100644 --- a/dist/U/d_castneg.U +++ b/dist/U/d_castneg.U @@ -23,7 +23,7 @@ ?X: ?X: Can the compiler cast negative / odd floats to unsigned values. ?X: -?MAKE:d_castneg castflags: cat +cc +ccflags rm Setvar signal_t +?MAKE:d_castneg castflags: cat +cc +ccflags rm_try Setvar signal_t ?MAKE: -pick add $@ %< ?S:d_castneg: ?S: This variable conditionally defines CASTNEG, which indicates @@ -139,5 +139,5 @@ case "$castflags" in esac set d_castneg eval $setvar -$rm -f try.* +$rm_try diff --git a/dist/U/d_gconvert.U b/dist/U/d_gconvert.U index efd24f0..af79327 100644 --- a/dist/U/d_gconvert.U +++ b/dist/U/d_gconvert.U @@ -21,7 +21,7 @@ ?RCS: Revision 3.0.1.1 1994/10/29 16:12:51 ram ?RCS: patch36: created by ADO ?RCS: -?MAKE:d_Gconvert: cat cc ccflags ldflags libs rm _o +?MAKE:d_Gconvert: cat cc ccflags ldflags libs rm_try _o ?MAKE: -pick add $@ %< ?S:d_Gconvert: ?S: This variable holds what Gconvert is defined as to convert @@ -124,7 +124,7 @@ esac for xxx_convert in $xxx_list; do echo "Trying $xxx_convert" - $rm -f try try$_o + $rm_try if $cc $ccflags -DTRY_$xxx_convert $ldflags -o try \ try.c $libs > /dev/null 2>&1 ; then echo "$xxx_convert" found. >&4 diff --git a/dist/U/d_gnulibc.U b/dist/U/d_gnulibc.U index 12b1fef..a839def 100644 --- a/dist/U/d_gnulibc.U +++ b/dist/U/d_gnulibc.U @@ -10,7 +10,7 @@ ?RCS: that same Artistic License; a copy of which may be found at the root ?RCS: of the source tree for dist 4.0. ?RCS: -?MAKE:d_gnulibc gnulibc_version: Myread Oldconfig Setvar rm \ +?MAKE:d_gnulibc gnulibc_version: Myread Oldconfig Setvar rm_try \ cat Compile run ?MAKE: -pick add $@ %< ?S:d_gnulibc: @@ -92,7 +92,7 @@ else gnulibc_version='' echo "You are not using the GNU C Library" fi -$rm -f try try.* glibc.ver +$rm_try glibc.ver set d_gnulibc eval $setvar diff --git a/dist/U/d_stdstdio.U b/dist/U/d_stdstdio.U index e46cee1..fe3a853 100644 --- a/dist/U/d_stdstdio.U +++ b/dist/U/d_stdstdio.U @@ -27,7 +27,7 @@ ?RCS: ?MAKE:d_stdstdio d_stdiobase stdio_ptr stdio_cnt stdio_base \ stdio_bufsiz d_stdio_cnt_lval d_stdio_ptr_lval stdio_filbuf: cat \ - +cc +ccflags contains +ldflags +libs rm \ + +cc +ccflags contains +ldflags +libs rm_try \ Setvar Findhdr Oldconfig ?MAKE: -pick add $@ %< ?S:d_stdstdio: @@ -218,7 +218,7 @@ if $cc $ccflags $ldflags -o try try.c $libs >/dev/null 2>&1; then else echo "Your stdio doesn't appear very std." fi -$rm -f try.c try +$rm_try set d_stdstdio eval $setvar @@ -274,7 +274,7 @@ EOP else echo "Hmm. $filbuf doesn't seem to work." fi - $rm -f try.c try + $rm_try done case "$xxx" in notok) echo "I can't figure out how to access _filbuf" @@ -316,7 +316,7 @@ EOP else echo "However, it seems to be lacking the _base field." fi - $rm -f try.c try + $rm_try ;; esac set d_stdiobase diff --git a/dist/U/d_strctcpy.U b/dist/U/d_strctcpy.U index 5fbe8c9..c5e9c40 100644 --- a/dist/U/d_strctcpy.U +++ b/dist/U/d_strctcpy.U @@ -12,7 +12,7 @@ ?RCS: Revision 3.0 1993/08/18 12:07:34 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:d_strctcpy: cat rm cc Setvar +?MAKE:d_strctcpy: cat rm_try cc Setvar ?MAKE: -pick add $@ %< ?S:d_strctcpy: ?S: This variable conditionally defines the USE_STRUCT_COPY symbol, which @@ -49,5 +49,5 @@ else fi set d_strctcpy eval $setvar -$rm -f try.* +$rm_try diff --git a/dist/U/d_volatile.U b/dist/U/d_volatile.U index 196c8c3..a7e2e24 100644 --- a/dist/U/d_volatile.U +++ b/dist/U/d_volatile.U @@ -18,7 +18,7 @@ ?RCS: Revision 3.0 1993/08/18 12:07:57 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:d_volatile: cat +cc +ccflags rm Setvar +?MAKE:d_volatile: cat +cc +ccflags rm_try Setvar ?MAKE: -pick add $@ %< ?S:d_volatile: ?S: This variable conditionally defines the HASVOLATILE symbol, which @@ -70,5 +70,5 @@ else fi set d_volatile eval $setvar -$rm -f try.* +$rm_try diff --git a/dist/U/doublesize.U b/dist/U/doublesize.U index 15fc4cf..2fc5724 100644 --- a/dist/U/doublesize.U +++ b/dist/U/doublesize.U @@ -15,7 +15,7 @@ ?RCS: Revision 3.0 1993/08/18 12:08:06 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:doublesize: cat rm Myread +cc +ccflags +?MAKE:doublesize: cat rm_try Myread +cc +ccflags ?MAKE: -pick add $@ %< ?S:doublesize: ?S: This variable contains the value of the DOUBLESIZE symbol, which @@ -54,5 +54,5 @@ esac rp="What is the size of a double precision number (in bytes)?" . ./myread doublesize="$ans" -$rm -f try.c try +$rm_try diff --git a/dist/U/ebcdic.U b/dist/U/ebcdic.U index 87e875a..6a1dda3 100644 --- a/dist/U/ebcdic.U +++ b/dist/U/ebcdic.U @@ -13,7 +13,7 @@ ?RCS: Original author Jarkko Hietaniemi <[email protected]> ?RCS: Merged into dist by Andy Dougherty July 13, 1998 ?RCS: -?MAKE:ebcdic: Compile Setvar cat rm run +?MAKE:ebcdic: Compile Setvar cat rm_try run ?MAKE: -pick add $@ %< ?S:ebcdic: ?S: This variable conditionally defines EBCDIC if this @@ -52,7 +52,7 @@ else echo "I'm unable to compile the test program." >&4 echo "I'll assume ASCII or some ISO Latin. Or UTF8." >&4 fi -$rm -f try try.* +$rm_try set ebcdic eval $setvar diff --git a/dist/U/i_db.U b/dist/U/i_db.U index df11bbc..dad068e 100644 --- a/dist/U/i_db.U +++ b/dist/U/i_db.U @@ -20,7 +20,7 @@ ?RCS: Revision 3.0.1.1 1994/08/29 16:21:50 ram ?RCS: patch32: created by ADO ?RCS: -?MAKE:i_db db_hashtype db_prefixtype: Inhdr +cc +ccflags rm contains cat \ +?MAKE:i_db db_hashtype db_prefixtype: Inhdr +cc +ccflags rm_try contains cat \ d_const ?MAKE: -pick add $@ %< ?S:i_db: @@ -94,7 +94,7 @@ EOCP echo "I can't seem to compile the test program." >&4 db_hashtype=int fi - $rm -f try.* + $rm_try echo "Your version of Berkeley DB uses $db_hashtype for hash." ;; *) db_hashtype=int @@ -136,7 +136,7 @@ EOCP echo "I can't seem to compile the test program." >&4 db_prefixtype='int' fi - $rm -f try.* + $rm_try echo "Your version of Berkeley DB uses $db_prefixtype for prefix." ;; *) db_prefixtype='int' diff --git a/dist/U/i_dirent.U b/dist/U/i_dirent.U index 16836dc..9a4b017 100644 --- a/dist/U/i_dirent.U +++ b/dist/U/i_dirent.U @@ -29,7 +29,7 @@ ?X: This unit looks whether there is a dirent system or not ?X: ?MAKE:i_dirent d_dirnamlen direntrytype: test contains Setvar \ - Myread Findhdr cppstdin cppflags cppminus rm + Myread Findhdr cppstdin cppflags cppminus rm_try ?MAKE: -pick add $@ %< ?S:i_dirent: ?S: This variable conditionally defines I_DIRENT, which indicates @@ -124,7 +124,7 @@ else . ./myread direntrytype="$ans" fi -$rm -f try.c +$rm_try @end @@ -141,6 +141,6 @@ else fi set d_dirnamlen eval $setvar -$rm -f try.c +$rm_try @end diff --git a/dist/U/i_neterrno.U b/dist/U/i_neterrno.U index a0003e6..7bc231d 100644 --- a/dist/U/i_neterrno.U +++ b/dist/U/i_neterrno.U @@ -20,7 +20,7 @@ ?RCS: Revision 3.0.1.1 1994/06/20 07:02:05 ram ?RCS: patch30: created by ADO ?RCS: -?MAKE:i_neterrno: Inhdr +cc +ccflags rm Setvar +?MAKE:i_neterrno: Inhdr +cc +ccflags rm_try Setvar ?MAKE: -pick add $@ %< ?S:i_neterrno: ?S: This variable conditionally defines the I_NET_ERRNO symbol, which @@ -57,7 +57,7 @@ EOM echo "We won't be including <net/errno.h>." >&4 val="$undef" fi - $rm -f try.* try + $rm_try ;; esac set i_neterrno diff --git a/dist/U/i_time.U b/dist/U/i_time.U index f7cd04a..e590f41 100644 --- a/dist/U/i_time.U +++ b/dist/U/i_time.U @@ -17,7 +17,7 @@ ?X: program, we also try to find which header should be included. Eventually, ?X: we look for <sys/select.h> if I_SYSSELECT is used, to get struct timeval. ?X: -?MAKE:i_time i_systime i_systimek timeincl: cat cc ccflags contains rm \ +?MAKE:i_time i_systime i_systimek timeincl: cat cc ccflags contains rm_try \ echo n c +i_sysselct Findhdr ?MAKE: -pick add $@ %< ?S:i_time: @@ -167,5 +167,5 @@ case "$flags" in esac esac @end -$rm -f try.c try +$rm_try diff --git a/dist/U/intsize.U b/dist/U/intsize.U index 6ec3c8b..d5135db 100644 --- a/dist/U/intsize.U +++ b/dist/U/intsize.U @@ -8,7 +8,7 @@ ?RCS: that same Artistic License; a copy of which may be found at the root ?RCS: of the source tree for dist 4.0. ?RCS: -?MAKE:intsize longsize shortsize: Assert Myread cat rm +cc +ccflags echo n c +?MAKE:intsize longsize shortsize: Assert Myread cat rm_try +cc +ccflags echo n c ?MAKE: -pick add $@ %< ?S:intsize: ?S: This variable contains the value of the INTSIZE symbol, which @@ -85,5 +85,5 @@ EOCP ;; esac done -$rm -f try.* +$rm_try diff --git a/dist/U/nblock_io.U b/dist/U/nblock_io.U index 12fda35..572fb02 100644 --- a/dist/U/nblock_io.U +++ b/dist/U/nblock_io.U @@ -21,7 +21,7 @@ ?X: Simplify here document for shells that can't handle them well. ?X: (Problem reported on FreeBSD; it's unclear if this helps.) --AD ?X: -?MAKE:o_nonblock eagain rd_nodata d_eofnblk: cat rm +cc +ccflags +ldflags \ +?MAKE:o_nonblock eagain rd_nodata d_eofnblk: cat rm_try +cc +ccflags +ldflags \ d_open3 h_sysfile h_fcntl signal_t hint Oldconfig Setvar startsh Warn ?MAKE: -pick add $@ %< ?S:o_nonblock: @@ -121,7 +121,7 @@ EOCP ;; *) echo "Using $hint value $o_nonblock.";; esac -$rm -f try try.* .out core +$rm_try echo " " echo "Let's see what value errno gets from read() on a $o_nonblock file..." >&4 @@ -250,5 +250,5 @@ EOCP esac ;; esac -$rm -f try try.* .out core head.c mtry +$rm_try head.c mtry diff --git a/dist/U/ptrsize.U b/dist/U/ptrsize.U index 2ea9921..42890f3 100644 --- a/dist/U/ptrsize.U +++ b/dist/U/ptrsize.U @@ -8,7 +8,7 @@ ?RCS: that same Artistic License; a copy of which may be found at the root ?RCS: of the source tree for dist 4.0. ?RCS: -?MAKE:ptrsize: cat rm Myread +cc +ccflags +?MAKE:ptrsize: cat rm_try Myread +cc +ccflags ?MAKE: -pick add $@ %< ?S:ptrsize: ?S: This variable contains the value of the PTRSIZE symbol, which @@ -47,5 +47,5 @@ esac rp="What is the size of a pointer (in bytes)?" . ./myread ptrsize="$ans" -$rm -f try.c try +$rm_try diff --git a/dist/U/voidflags.U b/dist/U/voidflags.U index 9c28ebc..857be9c 100644 --- a/dist/U/voidflags.U +++ b/dist/U/voidflags.U @@ -18,7 +18,7 @@ ?RCS: Revision 3.0 1993/08/18 12:10:01 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:voidflags defvoidused: cat sed rm contains +cc +ccflags package \ +?MAKE:voidflags defvoidused: cat sed rm rm_try contains +cc +ccflags package \ Oldconfig Myread ?MAKE: -pick add $@ %< ?S:voidflags: @@ -164,5 +164,5 @@ case "$voidflags" in voidflags="$ans" ;; esac -$rm -f try.* .out flags +$rm_try flags -- perl5 metaconfig repository
