summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-08-23 22:14:16 +0000
committerMike Frysinger <vapier@gentoo.org>2011-08-23 22:14:16 +0000
commit37a758fd9e635cc0a89ce033d99b2bded01da576 (patch)
tree493ccfda4a8373400f28c493b4e5756e223d0711 /sys-power/powertop/files
parentAdd dependency on kde-base/kdebase-kioslaves, bug 374399 (diff)
downloadgentoo-2-37a758fd9e635cc0a89ce033d99b2bded01da576.tar.gz
gentoo-2-37a758fd9e635cc0a89ce033d99b2bded01da576.tar.bz2
gentoo-2-37a758fd9e635cc0a89ce033d99b2bded01da576.zip
Version bump and merging of live/release ebuilds.
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Diffstat (limited to 'sys-power/powertop/files')
-rw-r--r--sys-power/powertop/files/powertop-1.98-build-cc.patch28
-rw-r--r--sys-power/powertop/files/powertop-1.98-build.patch26
2 files changed, 54 insertions, 0 deletions
diff --git a/sys-power/powertop/files/powertop-1.98-build-cc.patch b/sys-power/powertop/files/powertop-1.98-build-cc.patch
new file mode 100644
index 000000000000..70beb81db3ba
--- /dev/null
+++ b/sys-power/powertop/files/powertop-1.98-build-cc.patch
@@ -0,0 +1,28 @@
+From e2a8efc2d349880833215ccbe9ac6cb80cdfe5d0 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 23 Aug 2011 18:03:38 -0400
+Subject: [PATCH] allow control over the build compiler
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f637bfe..75e6e63 100644
+--- a/Makefile
++++ b/Makefile
+@@ -80,8 +80,9 @@ install: powertop
+ @(cd po/ && env LOCALESDIR=$(LOCALESDIR) DESTDIR=$(DESTDIR) $(MAKE) $@)
+
+
++BUILD_CC ?= gcc
+ csstoh: csstoh.c
+- gcc -o csstoh csstoh.c
++ $(BUILD_CC) -o csstoh csstoh.c
+
+ css.h: csstoh powertop.css
+ ./csstoh powertop.css css.h
+--
+1.7.6
+
diff --git a/sys-power/powertop/files/powertop-1.98-build.patch b/sys-power/powertop/files/powertop-1.98-build.patch
new file mode 100644
index 000000000000..cebb09f4ee3d
--- /dev/null
+++ b/sys-power/powertop/files/powertop-1.98-build.patch
@@ -0,0 +1,26 @@
+From f60a30a247fd1bfdd58de42934937a861e4b927a Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 23 Aug 2011 18:01:36 -0400
+Subject: [PATCH] use CFLAGS/LDFLAGS when linking
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b0b6cb7..f637bfe 100644
+--- a/Makefile
++++ b/Makefile
+@@ -70,7 +70,7 @@ clean:
+ rm -f *.o *~ powertop DEADJOE core.* */*.o */*~ csstoh css.h
+
+ powertop: $(OBJS) $(HEADERS)
+- $(CXX) $(OBJS) $(LIBS) -o powertop
++ $(CXX) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o powertop
+ @(cd po/ && $(MAKE))
+
+ install: powertop
+--
+1.7.6
+