| author | Stacy Yeh <stacy.yeh@oracle.com> |
| Wed, 08 Jul 2015 11:41:17 -0700 | |
| branch | s11-update |
| changeset 4603 | 915af16592e4 |
| permissions | -rw-r--r-- |
|
4603
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
1 |
Solaris-specific patch, not suitable for upstream. |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
2 |
Prevents gcc from throwing an error on warnings for "deprecated conversion |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
3 |
from string constant to 'char*'" that arises during building Squid. |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
4 |
|
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
5 |
diff -rupN squid-3.5.5-orig/configure squid-3.5.5/configure |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
6 |
--- squid-3.5.5-orig/configure 2015-06-18 10:43:50.253744903 -0700 |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
7 |
+++ squid-3.5.5/configure 2015-06-18 10:44:36.173461352 -0700 |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
8 |
@@ -19975,13 +19975,13 @@ fi |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
9 |
if test "$squid_cv_compiler" = "gcc"; then |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
10 |
case "$squid_host_os" in |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
11 |
mingw) |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
12 |
- SQUID_CFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wwrite-strings -Wcomments -Wshadow" |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
13 |
+ SQUID_CFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wno-write-strings -Wcomments -Wshadow" |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
14 |
;; |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
15 |
*) |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
16 |
- SQUID_CFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments -Wshadow" |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
17 |
+ SQUID_CFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wno-write-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments -Wshadow" |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
18 |
;; |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
19 |
esac |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
20 |
- SQUID_CXXFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wwrite-strings -Wcomments -Wshadow" |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
21 |
+ SQUID_CXXFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wno-write-strings -Wcomments -Wshadow" |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
22 |
else |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
23 |
SQUID_CFLAGS= |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
24 |
SQUID_CXXFLAGS= |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
25 |
diff -rupN squid-3.5.5-orig/configure.ac squid-3.5.5/configure.ac |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
26 |
--- squid-3.5.5-orig/configure.ac 2015-06-18 10:44:01.422693185 -0700 |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
27 |
+++ squid-3.5.5/configure.ac 2015-06-18 10:44:50.759898824 -0700 |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
28 |
@@ -361,13 +361,13 @@ dnl Guido Serassio (serassio@squid-cache |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
29 |
dnl Using the latest MinGW (gcc 3.4.5 + mingw-runtime 3.13) cannot build with |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
30 |
dnl -Werror -Wmissing-prototypes -Wmissing-declarations |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
31 |
dnl TODO: check if the problem will be present in any other newer MinGW release. |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
32 |
- SQUID_CFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wwrite-strings -Wcomments -Wshadow" |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
33 |
+ SQUID_CFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wno-write-strings -Wcomments -Wshadow" |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
34 |
;; |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
35 |
*) |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
36 |
- SQUID_CFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments -Wshadow" |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
37 |
+ SQUID_CFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wno-write-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments -Wshadow" |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
38 |
;; |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
39 |
esac |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
40 |
- SQUID_CXXFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wwrite-strings -Wcomments -Wshadow" |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
41 |
+ SQUID_CXXFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wno-write-strings -Wcomments -Wshadow" |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
42 |
else |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
43 |
SQUID_CFLAGS= |
|
915af16592e4
21305852 update to squid 3.5.5
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
44 |
SQUID_CXXFLAGS= |