| @@ -1,29 +1,40 @@ | | | @@ -1,29 +1,40 @@ |
1 | $NetBSD: patch-ac,v 1.29 2014/05/10 13:29:41 richard Exp $ | | 1 | $NetBSD: patch-ac,v 1.30 2014/05/10 13:35:10 richard Exp $ |
2 | | | 2 | |
3 | --- libltdl/config/ltmain.sh.orig 2011-10-17 10:19:35.000000000 +0000 | | 3 | --- libltdl/config/ltmain.sh.orig 2011-10-17 10:19:35.000000000 +0000 |
4 | +++ libltdl/config/ltmain.sh | | 4 | +++ libltdl/config/ltmain.sh |
5 | @@ -133,8 +133,9 @@ $lt_unset CDPATH | | 5 | @@ -133,8 +133,9 @@ $lt_unset CDPATH |
6 | # function. | | 6 | # function. |
7 | progpath="$0" | | 7 | progpath="$0" |
8 | | | 8 | |
9 | - | | 9 | - |
10 | - | | 10 | - |
11 | +unset CP | | 11 | +unset CP |
12 | +unset MV | | 12 | +unset MV |
13 | +unset RM | | 13 | +unset RM |
14 | : ${CP="cp -f"} | | 14 | : ${CP="cp -f"} |
15 | test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} | | 15 | test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} |
16 | : ${MAKE="make"} | | 16 | : ${MAKE="make"} |
| | | 17 | @@ -1180,7 +1181,9 @@ func_enable_tag "$optarg" |
| | | 18 | test "$opt_debug" = : || func_append preserve_args " --debug" |
| | | 19 | |
| | | 20 | case $host in |
| | | 21 | - *cygwin* | *mingw* | *pw32* | *cegcc*) |
| | | 22 | + # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=1645 |
| | | 23 | + # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 |
| | | 24 | + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* ) |
| | | 25 | # don't eliminate duplications in $postdeps and $predeps |
| | | 26 | opt_duplicate_compiler_generated_deps=: |
| | | 27 | ;; |
17 | @@ -5847,13 +5850,14 @@ func_mode_link () | | 28 | @@ -5847,13 +5850,14 @@ func_mode_link () |
18 | # -m*, -t[45]*, -txscale* architecture-specific flags for GCC | | 29 | # -m*, -t[45]*, -txscale* architecture-specific flags for GCC |
19 | # -F/path path to uninstalled frameworks, gcc on darwin | | 30 | # -F/path path to uninstalled frameworks, gcc on darwin |
20 | # -p, -pg, --coverage, -fprofile-* profiling flags for GCC | | 31 | # -p, -pg, --coverage, -fprofile-* profiling flags for GCC |
21 | + # -fstack-protector* stack protector flags for GCC | | 32 | + # -fstack-protector* stack protector flags for GCC |
22 | # @file GCC response files | | 33 | # @file GCC response files |
23 | # -tp=* Portland pgcc target processor selection | | 34 | # -tp=* Portland pgcc target processor selection |
24 | # --sysroot=* for sysroot support | | 35 | # --sysroot=* for sysroot support |
25 | # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization | | 36 | # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization |
26 | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ | | 37 | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ |
27 | -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ | | 38 | -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ |
28 | - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) | | 39 | - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) |
29 | + -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) | | 40 | + -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) |