diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-31 20:18:54 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-31 20:18:54 +0200 |
| commit | ac46bdeef28bc2b65e1880884a79257c28e423a7 (patch) | |
| tree | 50b3bae39301c2ef89bbbabdb843a62d679e034e /package/libpng/patches/patch-ltmain_sh | |
| parent | 418fb3668f7140cc3e2ba07c354fe0d9bbb47d04 (diff) | |
| parent | 84b90159b05aaa4e914ce51d2b1319218c32d8a1 (diff) | |
fix conflict, autoseect libgcj
Diffstat (limited to 'package/libpng/patches/patch-ltmain_sh')
| -rw-r--r-- | package/libpng/patches/patch-ltmain_sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package/libpng/patches/patch-ltmain_sh b/package/libpng/patches/patch-ltmain_sh index 3dc47967e..8ead586e9 100644 --- a/package/libpng/patches/patch-ltmain_sh +++ b/package/libpng/patches/patch-ltmain_sh @@ -1,11 +1,11 @@ ---- libpng-1.2.44.orig/ltmain.sh 2009-11-22 15:45:24.000000000 +0100 -+++ libpng-1.2.44/ltmain.sh 2011-01-14 00:13:24.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files +--- libpng-1.5.1.orig/ltmain.sh 2011-02-03 05:58:21.000000000 +0100 ++++ libpng-1.5.1/ltmain.sh 2011-03-27 19:35:09.613370655 +0200 +@@ -5840,7 +5840,7 @@ func_mode_link () + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ +- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" |