| author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
| Thu, 31 Jul 2014 12:11:52 -0700 | |
| branch | s11u2-sru |
| changeset 3244 | 5fe7a1d88248 |
| parent 2825 | cb999e84659c |
| permissions | -rw-r--r-- |
|
2825
cb999e84659c
17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff
changeset
|
1 |
--- gcc-3.4.3/Makefile.in.ori 2013-10-02 15:26:58.900044697 -0700 |
|
cb999e84659c
17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff
changeset
|
2 |
+++ gcc-3.4.3/Makefile.in 2013-10-02 15:28:18.200115934 -0700 |
|
cb999e84659c
17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff
changeset
|
3 |
@@ -186,7 +186,7 @@ |
|
cb999e84659c
17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff
changeset
|
4 |
USUAL_MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \ |
|
cb999e84659c
17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff
changeset
|
5 |
then echo $$r/texinfo/makeinfo/makeinfo ; \ |
|
cb999e84659c
17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff
changeset
|
6 |
else if (makeinfo --version \ |
|
cb999e84659c
17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff
changeset
|
7 |
- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \ |
|
cb999e84659c
17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff
changeset
|
8 |
+ | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.13|4\.[2-9]|[5-9])') >/dev/null 2>&1; \ |
|
cb999e84659c
17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff
changeset
|
9 |
then echo makeinfo; else echo $$s/missing makeinfo; fi; fi` |
|
cb999e84659c
17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff
changeset
|
10 |
|
|
cb999e84659c
17629924 texinfo 4.13 - make 64bits build, enable ASLR, and remove SFW links
Bick Torrejon <bick.torrejon@oracle.com>
parents:
diff
changeset
|
11 |
# This just becomes part of the MAKEINFO definition passed down to |