aboutsummaryrefslogtreecommitdiffstats
path: root/testing/cpupower
diff options
context:
space:
mode:
authorBartłomiej Piotrowski <b@bpiotrowski.pl>2016-07-11 21:28:37 +0200
committerBartłomiej Piotrowski <b@bpiotrowski.pl>2016-07-11 21:28:57 +0200
commit10ffd057ca835020a8376a74f5d19c81c374ec12 (patch)
tree46ac184a654d64899ac6841df3a5222a1e5134c4 /testing/cpupower
parent02f8d2c555ef35dd5d8b1e93c4eb85b0c2b7f641 (diff)
downloadaports-10ffd057ca835020a8376a74f5d19c81c374ec12.tar.bz2
aports-10ffd057ca835020a8376a74f5d19c81c374ec12.tar.xz
testing/cpupower: fix build
Diffstat (limited to 'testing/cpupower')
-rw-r--r--testing/cpupower/APKBUILD6
-rw-r--r--testing/cpupower/nls.patch19
2 files changed, 22 insertions, 3 deletions
diff --git a/testing/cpupower/APKBUILD b/testing/cpupower/APKBUILD
index 5556a3bf0f..6dfb7b9415 100644
--- a/testing/cpupower/APKBUILD
+++ b/testing/cpupower/APKBUILD
@@ -40,12 +40,12 @@ package() {
md5sums="59e99c3bf5d495f1f95d26257962ca3e linux-4.4.14.tar.xz
209e4f95728bd7c7c4ba35c320683a9b cpupower.initd
fc335236f7617b042066c6231d5c9b87 cpupower.confd
-7dc0db8ecffc644ecb5ceb0f9bba01a5 nls.patch"
+b85e224699b4988482a9e624ac415961 nls.patch"
sha256sums="5953ba12797160a68b1068378f826ddac8a298f8f3273876d3bd18222b0555f9 linux-4.4.14.tar.xz
bd7133303c9a0fc892267335b6fb371d6179c6f4251d7f360ae82d7d1f0b321f cpupower.initd
9ab6f022d2b2948660decf5e383984e6ddb9e9e5e6e2761c3031378ddd87e947 cpupower.confd
-14348a34a8936bee6c287fc8d48d0d2db01768a8ade7b4df9716f249093d21a7 nls.patch"
+c2b4dfe619c54e40c36bfbc541f18d57f15e07f1788df4a2e9bc336b443a5860 nls.patch"
sha512sums="c9d4f3e8949cfb715ff2fc4169a12938132f967ad509c154f5c8598c70ac14989364083f1ab29c2fbab120945363f1343f2a30819df9be53938d4ef43391dbc5 linux-4.4.14.tar.xz
97ecfeaaaa8efca7af585316b843bf7be885e88095bbdfbf52bc9a96b14dc862435482781e205ea022ab208978aaa4aabb317354fab890ed514a5088ae5045c8 cpupower.initd
63cd12a4d8782198c71662e9205e346e064b65bae5e3e175b5bc43bdf7ec6ddf675b60349750afe3c37c8a925f9ae9a93530671821342581bd282a69e0773b8c cpupower.confd
-41e48942786a253b74261aa860d049323f2084fa2f9fa9ab4bf5721dab100a9623bda46fec5dadd2f5d21051610ce7fdb918607bcb7f6b99552a2b39c8a70720 nls.patch"
+f4e8365ddccc26f3dec66311fac04560661934f9ddb888d48c2e67818a0647883e13e8542149f7981f532ff58c002e901ca543061cd0c46c29ea089dfe3ceafe nls.patch"
diff --git a/testing/cpupower/nls.patch b/testing/cpupower/nls.patch
index 85398b4cda..24f5afd45f 100644
--- a/testing/cpupower/nls.patch
+++ b/testing/cpupower/nls.patch
@@ -43,6 +43,25 @@ index 9ea9143..24d19db 100644
/* Turn "perf cmd --help" into "perf help cmd" */
if (argc > 1 && !strcmp(argv[1], "--help")) {
+diff --git a/tools/power/cpupower/utils/helpers/helpers.h b/tools/power/cpupower/utils/helpers/helpers.h
+index aa9e954..261692a 100644
+--- a/tools/power/cpupower/utils/helpers/helpers.h
++++ b/tools/power/cpupower/utils/helpers/helpers.h
+@@ -10,13 +10,13 @@
+ #ifndef __CPUPOWERUTILS_HELPERS__
+ #define __CPUPOWERUTILS_HELPERS__
+
+-#include <libintl.h>
+ #include <locale.h>
+
+ #include "helpers/bitmask.h"
+
+ /* Internationalization ****************************/
+ #ifdef NLS
++#include <libintl.h>
+
+ #define _(String) gettext(String)
+ #ifndef gettext_noop
diff --git a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
index 05f953f..dec8ff9 100644
--- a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c