diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-31 20:20:09 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-31 20:20:09 +0200 |
| commit | c2bd3a43342e37a05a97e12581dd2bd52993877a (patch) | |
| tree | 39f9427d581669d8f619b4df44c5c5548c8fd955 /package/gtk+/patches/patch-ltmain_sh | |
| parent | ac46bdeef28bc2b65e1880884a79257c28e423a7 (diff) | |
Revert "fix conflict, autoseect libgcj"
This reverts commit ac46bdeef28bc2b65e1880884a79257c28e423a7, reversing
changes made to 418fb3668f7140cc3e2ba07c354fe0d9bbb47d04.
Diffstat (limited to 'package/gtk+/patches/patch-ltmain_sh')
| -rw-r--r-- | package/gtk+/patches/patch-ltmain_sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package/gtk+/patches/patch-ltmain_sh b/package/gtk+/patches/patch-ltmain_sh index 8104e4837..77ed2f207 100644 --- a/package/gtk+/patches/patch-ltmain_sh +++ b/package/gtk+/patches/patch-ltmain_sh @@ -1,11 +1,11 @@ ---- gtk+-2.24.3.orig/ltmain.sh 2011-02-08 13:25:07.000000000 +0100 -+++ gtk+-2.24.3/ltmain.sh 2011-03-18 00:44:15.143369818 +0100 -@@ -5840,7 +5840,7 @@ func_mode_link () - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization +--- gtk+-2.18.6.orig/ltmain.sh 2009-12-02 12:35:38.000000000 +0100 ++++ gtk+-2.18.6/ltmain.sh 2011-01-19 15:27:06.368658496 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" |