Change 25400 by [EMAIL PROTECTED] on 2005/09/13 17:33:24
Integrate:
[ 24313]
Subject: [PATCH] Add -Wdeclaration-after-statement to default flags for
gcc 3+
From: Steve Peters <[EMAIL PROTECTED]>
Date: Sat, 23 Apr 2005 22:37:48 -0500
Message-ID: <[EMAIL PROTECTED]>
[ 24432]
Subject: [PATCH] Avoid USE_SITECUSTOMIZE redefined warnings
From: Jan Dubois <[EMAIL PROTECTED]>
Date: Mon, 9 May 2005 19:29:06 -0700
Message-Id: <[EMAIL PROTECTED]>
Affected files ...
... //depot/maint-5.8/perl/Configure#63 integrate
... //depot/maint-5.8/perl/config_h.SH#31 integrate
Differences ...
==== //depot/maint-5.8/perl/Configure#63 (xtext) ====
Index: perl/Configure
--- perl/Configure#62~24262~ Wed Apr 20 09:30:39 2005
+++ perl/Configure Tue Sep 13 10:33:24 2005
@@ -20,7 +20,7 @@
# $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
#
-# Generated on Mon Apr 11 12:33:25 CEST 2005 [metaconfig 3.0 PL70]
+# Generated on Sun Apr 24 14:17:04 CEST 2005 [metaconfig 3.0 PL70]
# (with additional metaconfig patches by [EMAIL PROTECTED])
cat >c1$$ <<EOF
@@ -4745,13 +4745,27 @@
?*) echo " "
echo "Checking if your compiler accepts -pipe" 2>&1
echo 'int main(void) { return 0; }' > gcctest.c
- if $cc -O2 -pipe -o gcctest gcctest.c; then
+ if $cc -pipe -o gcctest gcctest.c; then
echo "Yes, it does." 2>&1
case "$ccflags" in
*-pipe*)
echo "Leaving current flags $ccflags alone."
2>&1
;;
*) dflt="$dflt -pipe" ;;
+ esac
+ else
+ echo "Nope, it doesn't, but that's ok." 2>&1
+ fi
+
+ echo "Checking if your compiler accepts
-Wdeclaration-after-statement" 2>&1
+ echo 'int main(void) { return 0; }' > gcctest.c
+ if $cc -Wdeclaration-after-statement -o gcctest gcctest.c; then
+ echo "Yes, it does." 2>&1
+ case "$ccflags" in
+ *-Wdeclaration-after-statement*)
+ echo "Leaving current flags $ccflags alone."
2>&1
+ ;;
+ *) dflt="$dflt -Wdeclaration-after-statement" ;;
esac
else
echo "Nope, it doesn't, but that's ok." 2>&1
==== //depot/maint-5.8/perl/config_h.SH#31 (text) ====
Index: perl/config_h.SH
--- perl/config_h.SH#30~24356~ Sat Apr 30 10:02:19 2005
+++ perl/config_h.SH Tue Sep 13 10:33:24 2005
@@ -3486,7 +3486,9 @@
* This symbol, if defined, indicates that sitecustomize should
* be used.
*/
+#ifndef USE_SITECUSTOMIZE
#$usesitecustomize USE_SITECUSTOMIZE /**/
+#endif
/* Size_t_size:
* This symbol holds the size of a Size_t in bytes.
End of Patch.
