diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 15:34:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 15:34:13 +0100 |
| commit | 902ee7e7b23751ca7a8264d36a837aa4aae12032 (patch) | |
| tree | 56c6b37cd9afd91d176cd75acb77bf32ccd20378 /package/dbus | |
| parent | 3d45df344602687c8983f5fb609721aa8ca2469f (diff) | |
| parent | 52dbdcd1045c7a8ad96753593540719cff9f8863 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/dbus')
| -rw-r--r-- | package/dbus/patches/patch-configure | 4 | ||||
| -rw-r--r-- | package/dbus/patches/patch-ltmain_sh | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/package/dbus/patches/patch-configure b/package/dbus/patches/patch-configure index 85521d390..18acacbc8 100644 --- a/package/dbus/patches/patch-configure +++ b/package/dbus/patches/patch-configure @@ -1,6 +1,6 @@ --- dbus-1.2.24.orig/configure 2010-03-23 20:11:22.000000000 +0100 -+++ dbus-1.2.24/configure 2011-01-08 22:50:31.000000000 +0100 -@@ -25294,19 +25296,6 @@ if test "x$GCC" = "xyes"; then ++++ dbus-1.2.24/configure 2011-01-14 19:21:37.000000000 +0100 +@@ -25294,19 +25294,6 @@ if test "x$GCC" = "xyes"; then ;; esac diff --git a/package/dbus/patches/patch-ltmain_sh b/package/dbus/patches/patch-ltmain_sh index b63e1d647..c594b88f2 100644 --- a/package/dbus/patches/patch-ltmain_sh +++ b/package/dbus/patches/patch-ltmain_sh @@ -1,5 +1,14 @@ --- dbus-1.2.24.orig/ltmain.sh 2010-03-12 23:22:29.000000000 +0100 -+++ dbus-1.2.24/ltmain.sh 2011-01-08 22:57:14.000000000 +0100 ++++ dbus-1.2.24/ltmain.sh 2011-01-14 19:22:39.000000000 +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*|@*) ++ -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" @@ -5516,27 +5516,6 @@ func_mode_link () esac fi |