[olpc-powerd] fix compile with gcc-4.6

Daniel Drake dsd at fedoraproject.org
Thu Feb 10 15:18:32 UTC 2011


commit 29e33a913a00ca1524f9688e89404cc82a1f3924
Author: Daniel Drake <dsd at laptop.org>
Date:   Thu Feb 10 15:22:41 2011 +0000

    fix compile with gcc-4.6

 olpc-powerd.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/olpc-powerd.spec b/olpc-powerd.spec
index 656265b..ac645f1 100644
--- a/olpc-powerd.spec
+++ b/olpc-powerd.spec
@@ -1,7 +1,7 @@
 Summary: OLPC XO power management
 Name: olpc-powerd
 Version: 31
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://dev.laptop.org/git/users/pgf/powerd/tree/powerd
@@ -40,6 +40,9 @@ over the D-Bus system bus.
 %setup -q
 %patch1 -p1
 
+# "gcc -combine" dropped for gcc-4.6
+sed -i -e 's/combine/flto/' powerd-dbus/Makefile
+
 %build
 export OPT_FLAGS="$RPM_OPT_FLAGS"
 make
@@ -137,6 +140,9 @@ fi
 exit 0
 
 %changelog
+* Thu Feb 10 2011 Daniel Drake <dsd at laptop.org> - 31-3
+- -combine gcc option was dropped, switch to -flto
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 31-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list