| author | Alan Coopersmith <Alan.Coopersmith@Oracle.COM> |
| Mon, 24 Oct 2016 23:32:49 -0700 | |
| changeset 7209 | d19b72e9391b |
| permissions | -rw-r--r-- |
|
7209
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
1 |
Fix linking with gcc 5 using -fstack-protector. |
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
2 |
|
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
3 |
Need to determine if this should be submitted upstream. |
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
4 |
|
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
5 |
--- gnome-terminal-3.18.0/configure.ac Fri Oct 16 08:43:20 2015 |
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
6 |
+++ gnome-terminal-3.18.0/configure.ac Fri Oct 16 08:43:43 2015 |
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
7 |
@@ -267,6 +265,13 @@ |
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
8 |
# *********** |
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
9 |
# Compilation |
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
10 |
# *********** |
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
11 |
+# If these flags are supported for compilation, they must also be used when |
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
12 |
+# linking. To ensure that libtool doesn't strip them out, they're |
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
13 |
+# explicitly added to LDFLAGS using -Wc,$OPTION |
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
14 |
+if test "$cc_cv_CFLAGS__fstack_protector" != "no"; then |
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
15 |
+ eval "AM_LDFLAGS='${AM_LDFLAGS} -Wc,-fstack-protector'"
|
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
16 |
+fi |
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
17 |
+ |
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
18 |
|
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
19 |
WARN_CFLAGS= |
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
20 |
CC_CHECK_FLAGS_APPEND([WARN_CFLAGS],[CFLAGS],[ \ |
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
21 |
@@ -310,7 +308,6 @@ |
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
22 |
-fno-strict-aliasing \ |
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
23 |
-fvisibility=hidden \ |
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
24 |
-fstack-protector \ |
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
25 |
- -fstack-protector-strong \ |
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
26 |
]) |
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
27 |
|
|
d19b72e9391b
23245313 Move gnome-terminal to Userland and update to 3.18.2
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff
changeset
|
28 |
# ********* |