Change 30029 by [EMAIL PROTECTED] on 2007/01/27 13:10:53
Integrate:
[ 26135]
Subject: [PATCH] Re: Cygwin status, maint and blead
From: Yitzchak Scott-Thoennes <[EMAIL PROTECTED]>
Date: Sun, 13 Nov 2005 16:01:02 -0800
Message-ID: <[EMAIL PROTECTED]>
[ 26993]
Subject: Re: [patch] s/ar ts/ar s/g
From: "Philippe M. Chiasson" <[EMAIL PROTECTED]>
Date: Thu, 26 Jan 2006 13:53:07 -0800
Message-ID: <[EMAIL PROTECTED]>
[ 27004]
Teach the Makefile how to cleanup config.over.
[ 27214]
Subject: Re: Smoke [5.9.4] 27195 FAIL(m) irix 6.2 (IP22/1 cpu)
From: Abe Timmerman <[EMAIL PROTECTED]>
Message-Id: <[EMAIL PROTECTED]>
Date: Fri, 17 Feb 2006 23:58:23 +0100
[ 27518]
Simplify; make perl.o included in $(obj)
[ 27519]
Fix up miniperl dependency.
Depend on $(obj) when we use that to build miniperl.
[ 27891]
When checking whether perl is built with -g in optimisation
flags, use a more tolerant regexp, because we can now have
things like '-O2 -g'.
[ 28362]
Subject: [PATCH]Teach Configure that icc is not gcc
From: Steve Peters <[EMAIL PROTECTED]>
Date: Tue, 6 Jun 2006 10:33:12 -0500
Message-ID: <[EMAIL PROTECTED]>
[ 28471]
Subject: [PATCH] Makefile splint support
From: [EMAIL PROTECTED] (Andy Lester)
Date: Sun, 2 Jul 2006 12:19:08 -0500
Message-ID: <[EMAIL PROTECTED]>
[ 28637]
ANSI-C headers in test snippets to please g++ (and the rest)
Subject: [PATCH] (back) towards g++ compilation (in Tru64, and
elsewhere)
From: Jarkko Hietaniemi <[EMAIL PROTECTED]>
Date: Mon, 31 Jul 2006 23:44:55 +0300
Message-ID: <[EMAIL PROTECTED]>
[ 28651]
Subject: [PATCH] g++ heavy shoveling
From: Jarkko Hietaniemi <[EMAIL PROTECTED]>
Date: Wed, 02 Aug 2006 00:04:42 +0300
Message-ID: <[EMAIL PROTECTED]>
[ 29276]
Subject: [PATCH] Makefile.SH: lib/re.pm often messes restarted parallel
makes
From: [EMAIL PROTECTED] (Jarkko Hietaniemi)
Date: Wed, 15 Nov 2006 05:48:32 +0200 (EET)
Message-Id: <[EMAIL PROTECTED]>
[ 29497]
Subject: Re: [PATCH 5.8.8] Build on OS/2 - missing part
From: Ilya Zakharevich <[EMAIL PROTECTED]>
Date: Sat, 9 Dec 2006 16:33:41 -0800
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/maint-5.8/perl/Makefile.SH#61 integrate
... //depot/maint-5.8/perl/os2/Makefile.SHs#7 integrate
Differences ...
==== //depot/maint-5.8/perl/Makefile.SH#61 (text) ====
Index: perl/Makefile.SH
--- perl/Makefile.SH#60~29896~ 2007-01-20 09:47:00.000000000 -0800
+++ perl/Makefile.SH 2007-01-27 05:10:53.000000000 -0800
@@ -375,7 +375,7 @@
c = $(c1) $(c2) $(c3) $(c4) miniperlmain.c perlmain.c opmini.c
obj1 = $(mallocobj) gv$(OBJ_EXT) toke$(OBJ_EXT) perly$(OBJ_EXT) op$(OBJ_EXT)
pad$(OBJ_EXT) regcomp$(OBJ_EXT) dump$(OBJ_EXT) util$(OBJ_EXT) mg$(OBJ_EXT)
reentr$(OBJ_EXT)
-obj2 = hv$(OBJ_EXT) av$(OBJ_EXT) run$(OBJ_EXT) pp_hot$(OBJ_EXT) sv$(OBJ_EXT)
pp$(OBJ_EXT) scope$(OBJ_EXT) pp_ctl$(OBJ_EXT) pp_sys$(OBJ_EXT)
+obj2 = hv$(OBJ_EXT) av$(OBJ_EXT) perl$(OBJ_EXT) run$(OBJ_EXT) pp_hot$(OBJ_EXT)
sv$(OBJ_EXT) pp$(OBJ_EXT) scope$(OBJ_EXT) pp_ctl$(OBJ_EXT) pp_sys$(OBJ_EXT)
obj3 = doop$(OBJ_EXT) doio$(OBJ_EXT) regexec$(OBJ_EXT) utf8$(OBJ_EXT)
taint$(OBJ_EXT) deb$(OBJ_EXT) universal$(OBJ_EXT) xsutils$(OBJ_EXT)
globals$(OBJ_EXT) perlio$(OBJ_EXT) perlapi$(OBJ_EXT) numeric$(OBJ_EXT)
mathoms$(OBJ_EXT) locale$(OBJ_EXT) pp_pack$(OBJ_EXT) pp_sort$(OBJ_EXT)
obj = $(obj1) $(obj2) $(obj3) $(ARCHOBJS)
@@ -397,19 +397,46 @@
-erroff=E_BAD_SIGN_EXTEND \
-erroff=E_BLOCK_DECL_UNUSED \
-erroff=E_CASE_FALLTHRU \
+ -erroff=E_CONST_EXPR \
-erroff=E_CONSTANT_CONDITION \
+ -erroff=E_END_OF_LOOP_CODE_NOT_REACHED \
-erroff=E_EQUALITY_NOT_ASSIGNMENT \
-erroff=E_EXPR_NULL_EFFECT \
-erroff=E_FALSE_LOGICAL_EXPR \
-erroff=E_INCL_NUSD \
- -erroff=E_INDISTING_FROM_TRUNC \
-erroff=E_LOOP_EMPTY \
-erroff=E_MAIN_PARAM \
-erroff=E_POINTER_TO_OBJECT \
-erroff=E_PTRDIFF_OVERFLOW \
-erroff=E_SHIFT_CNT_NEG_TOO_BIG_L \
-erroff=E_STATIC_UNUSED \
- -erroff=E_TRUE_LOGICAL_EXPR \
+ -erroff=E_TRUE_LOGICAL_EXPR
+
+splintflags = \
+ -I/usr/lib/gcc/i486-linux-gnu/4.0.2/include/ \
+ -D__builtin_va_list=va_list \
+ -Dsigjmp_buf=jmp_buf \
+ -warnposix \
+ \
+ +boolint \
+ +charintliteral \
+ -fixedformalarray \
+ -mustfreefresh \
+ -nestedextern \
+ -predboolint \
+ -predboolothers \
+ -preproc \
+ -boolops \
+ -shadow \
+ -nullstate \
+ +longintegral \
+ +matchanyintegral \
+ -type \
+ \
+ +line-len 999 \
+ +weak
+
+splintfiles = $(c1)
.c$(OBJ_EXT):
$(CCCMD) $(PLDLFLAGS) $*.c
@@ -515,9 +542,9 @@
LIBPERL_NONSHR = libperl_nonshr$(LIB_EXT)
MINIPERL_NONSHR = miniperl_nonshr$(EXE_EXT)
-$(LIBPERL_NONSHR): perl$(OBJ_EXT) $(obj)
+$(LIBPERL_NONSHR): $(obj)
$(RMS) $(LIBPERL_NONSHR)
- $(AR) rcu $(LIBPERL_NONSHR) perl$(OBJ_EXT) $(obj)
+ $(AR) rcu $(LIBPERL_NONSHR) $(obj)
$(MINIPERL_NONSHR): $(LIBPERL_NONSHR) miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT)
$(CC) $(LDFLAGS) -o $(MINIPERL_NONSHR) miniperlmain$(OBJ_EXT) \
@@ -550,7 +577,7 @@
MINIPERLEXP = miniperl
perl5.def: $(MINIPERLEXP) makedef.pl config.sh $(SYM) $(SYMH) miniperl.map
- ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL)
CC_FLAGS="$(OPTIMIZE)" > perl.exp
+ ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL)
CC_FLAGS="$(OPTIMIZE)" > perl5.def
!NO!SUBS!
;;
@@ -564,12 +591,12 @@
!GROK!THIS!
else
$spitshell >>Makefile <<'!NO!SUBS!'
-$(LIBPERL): $& perl$(OBJ_EXT) $(obj) $(LIBPERLEXPORT)
+$(LIBPERL): $& $(obj) $(LIBPERLEXPORT)
!NO!SUBS!
case "$useshrplib" in
true)
$spitshell >>Makefile <<'!NO!SUBS!'
- $(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj) $(libs)
+ $(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(libs)
!NO!SUBS!
case "$osname" in
aix)
@@ -584,7 +611,7 @@
*)
$spitshell >>Makefile <<'!NO!SUBS!'
rm -f $(LIBPERL)
- $(AR) rcu $(LIBPERL) perl$(OBJ_EXT) $(obj)
+ $(AR) rcu $(LIBPERL) $(obj)
@$(ranlib) $(LIBPERL)
!NO!SUBS!
;;
@@ -606,18 +633,18 @@
case "${osname}${osvers}" in
aix*|beos*)
$spitshell >>Makefile <<'!NO!SUBS!'
-miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT)
+miniperl: $& miniperlmain$(OBJ_EXT) $(obj) opmini$(OBJ_EXT)
$(CC) -o miniperl $(CLDFLAGS) \
`echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
- miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs)
+ miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(libs)
$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
!NO!SUBS!
;;
next4*)
$spitshell >>Makefile <<'!NO!SUBS!'
-miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT)
+miniperl: $& miniperlmain$(OBJ_EXT) $(obj) opmini$(OBJ_EXT)
$(CC) -o miniperl `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
- miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs)
+ miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(libs)
$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
!NO!SUBS!
;;
@@ -685,8 +712,8 @@
perl.config.dashg:
@echo "Checking optimize='-g' in config.sh..."
- @grep "^optimize=" config.sh
- @egrep "^optimize='(-g|.*-g[1-3].*)'" config.sh >/dev/null || exit 1
+ @grep "^optimize=" config.sh
+ @egrep "^optimize='(.*-g.*)'" config.sh >/dev/null || exit 1
perl.third.config: config.sh
@echo "To build perl.third you must Configure -Doptimize=-g
-Uusemymalloc, checking..."
@@ -803,6 +830,7 @@
$(LDLIBPTH) ./miniperl minimod.pl > lib/ExtUtils/Miniperl.pm
lib/re.pm: ext/re/re.pm
+ @-rm -f $@
cp ext/re/re.pm lib/re.pm
$(plextract): miniperl$(EXE_EXT) $(CONFIGPM) x2p/s2p
@@ -823,7 +851,7 @@
touch uni.data
extra.pods: miniperl$(EXE_EXT)
- [EMAIL PROTECTED] -f extra.pods && rm -f `cat extra.pods`
+ [EMAIL PROTECTED] ! -f extra.pods || rm -f `cat extra.pods`
[EMAIL PROTECTED] -f extra.pods
[EMAIL PROTECTED] x in `grep -l '^=[a-z]' README.* | grep -v
README.vms` ; do \
nx=`echo $$x | sed -e "s/README\.//"`; \
@@ -836,13 +864,13 @@
[EMAIL PROTECTED] -f pod/perl589delta.pod && cd pod && $(LNS)
perl589delta.pod perldelta.pod && cd .. && echo "pod/perldelta.pod" >>
extra.pods # See buildtoc
extras.make: perl$(EXE_EXT)
- [EMAIL PROTECTED] -s extras.lst && PATH="`pwd`:${PATH}"
PERL5LIB="`pwd`/lib" $(LDLIBPTH) ./perl -Ilib -MCPAN -e '@ARGV&&make(@ARGV)'
`cat extras.lst`
+ [EMAIL PROTECTED] ! -s extras.lst || PATH="`pwd`:${PATH}"
PERL5LIB="`pwd`/lib" $(LDLIBPTH) ./perl -Ilib -MCPAN -e '@ARGV&&make(@ARGV)'
`cat extras.lst`
extras.test: perl$(EXE_EXT)
- [EMAIL PROTECTED] -s extras.lst && PATH="`pwd`:${PATH}"
PERL5LIB="`pwd`/lib" $(LDLIBPTH) ./perl -Ilib -MCPAN -e '@ARGV&&test(@ARGV)'
`cat extras.lst`
+ [EMAIL PROTECTED] ! -s extras.lst || PATH="`pwd`:${PATH}"
PERL5LIB="`pwd`/lib" $(LDLIBPTH) ./perl -Ilib -MCPAN -e '@ARGV&&test(@ARGV)'
`cat extras.lst`
extras.install: perl$(EXE_EXT)
- [EMAIL PROTECTED] -s extras.lst && PATH="`pwd`:${PATH}"
PERL5LIB="`pwd`/lib" $(LDLIBPTH) ./perl -Ilib -MCPAN -e '@ARGV&&install(@ARGV)'
`cat extras.lst`
+ [EMAIL PROTECTED] ! -s extras.lst || PATH="`pwd`:${PATH}"
PERL5LIB="`pwd`/lib" $(LDLIBPTH) ./perl -Ilib -MCPAN -e '@ARGV&&install(@ARGV)'
`cat extras.lst`
.PHONY: install install-strip install-all install-verbose install-silent \
no-install install.perl install.man install.html
@@ -1056,6 +1084,7 @@
-rm -f perlld cygwin.c ld2 libperl*.def libperl*.dll cygperl*.dll
*.exe.stackdump
-rm -f perl$(EXE_EXT) suidperl$(EXE_EXT) miniperl$(EXE_EXT) $(LIBPERL)
libperl.* microperl
-rm -f opcode.h-old opnames.h-old pp.sym-old pp_proto.h-old
+ -rm -f config.over
# Do not 'make _tidy' directly.
_tidy:
@@ -1115,6 +1144,10 @@
rm -f *.ln
lint $(lintflags) -DPERL_CORE -D_REENTRANT -DDEBUGGING
-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(c)
+.PHONY: splint
+splint: $(c)
+ splint $(splintflags) -DPERL_CORE -D_REENTRANT -DDEBUGGING
-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(splintfiles)
+
# Need to unset during recursion to go out of loop.
# The README below ensures that the dependency list is never empty and
# that when MAKEDEPEND is empty $(FIRSTMAKEFILE) doesn't need rebuilding.
@@ -1355,7 +1388,7 @@
perl emacs/e2ctags.pl TAGS > tags
ctags:
- ctags -f Tags -N --totals --languages=c --langmap=c:+.h *.c *.h
+ ctags -f Tags -N --totals --languages=c --langmap=c:+.h
--exclude=opmini.c *.c *.h
# AUTOMATICALLY GENERATED MAKE DEPENDENCIES--PUT NOTHING BELOW THIS LINE
# If this runs make out of memory, delete /usr/include lines.
==== //depot/maint-5.8/perl/os2/Makefile.SHs#7 (text) ====
Index: perl/os2/Makefile.SHs
--- perl/os2/Makefile.SHs#6~26810~ 2006-01-12 12:34:45.000000000 -0800
+++ perl/os2/Makefile.SHs 2007-01-27 05:10:53.000000000 -0800
@@ -71,7 +71,7 @@
emximp -o $@ libperl_override.imp
libperl_dllmain.imp: imp_version
- echo 'main $(PERL_DLL_BASE) dll_perlmain ?' >> $@
+ echo 'main $(PERL_DLL_BASE) dll_perlmain ?' > $@
libperl_dllmain.lib: libperl_dllmain.imp
emximp -o $@ libperl_dllmain.imp
End of Patch.
