diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-12-02 09:52:11 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-12-02 09:53:48 +0000 |
| commit | 862c741a3ccc0936ce80840bad3937dec6a52c4d (patch) | |
| tree | 17c50031bdf772cd550ec3600fb4c2ba439a73f7 /main/cpufrequtils/cpufrequtils-006-nls.patch | |
| parent | fc0e71c84b2f87957a39905d17240097e8cb475f (diff) | |
| download | aports-862c741a3ccc0936ce80840bad3937dec6a52c4d.tar.bz2 aports-862c741a3ccc0936ce80840bad3937dec6a52c4d.tar.xz | |
main/cpufrequtils: apply upstream commits to fix arm build
and also the other issues we were already patching for.
Diffstat (limited to 'main/cpufrequtils/cpufrequtils-006-nls.patch')
| -rw-r--r-- | main/cpufrequtils/cpufrequtils-006-nls.patch | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/main/cpufrequtils/cpufrequtils-006-nls.patch b/main/cpufrequtils/cpufrequtils-006-nls.patch deleted file mode 100644 index 7d1c24dbd5..0000000000 --- a/main/cpufrequtils/cpufrequtils-006-nls.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/Makefile b/Makefile -index 19f3dd6..b7f1e56 100644 ---- a/Makefile -+++ b/Makefile -@@ -147,6 +147,7 @@ endif - ifeq ($(strip $(NLS)),true) - INSTALL_NLS += install-gmo - COMPILE_NLS += update-gmo -+ CFLAGDEF += -DNLS - endif - - ifeq ($(strip $(CPUFRQ_BENCH)),true) -diff --git a/utils/info.c b/utils/info.c -index 38d906a..155e604 100644 ---- a/utils/info.c -+++ b/utils/info.c -@@ -10,7 +10,6 @@ - #include <errno.h> - #include <stdlib.h> - #include <string.h> --#include <libintl.h> - #include <locale.h> - - #include <getopt.h> -@@ -18,9 +17,18 @@ - #include "cpufreq.h" - - -+#ifdef NLS -+#include <libintl.h> - #define _(String) gettext (String) - #define gettext_noop(String) String - #define N_(String) gettext_noop (String) -+#else -+#define gettext_noop(String) String -+#define _(String) gettext_noop (String) -+#define gettext(String) gettext_noop (String) -+#define N_(String) gettext_noop (String) -+#define textdomain(String) -+#endif - - #define LINE_LEN 10 - -diff --git a/utils/set.c b/utils/set.c -index 2ece47e..312cc8c 100644 ---- a/utils/set.c -+++ b/utils/set.c -@@ -12,16 +12,24 @@ - #include <limits.h> - #include <string.h> - #include <ctype.h> --#include <libintl.h> - #include <locale.h> - - #include <getopt.h> - - #include "cpufreq.h" - --#define _(String) gettext(String) -+#ifdef NLS -+#include <libintl.h> -+#define _(String) gettext (String) -+#define gettext_noop(String) String -+#define N_(String) gettext_noop (String) -+#else - #define gettext_noop(String) String --#define N_(String) gettext_noop(String) -+#define _(String) gettext_noop (String) -+#define gettext(String) gettext_noop (String) -+#define N_(String) gettext_noop (String) -+#define textdomain(String) -+#endif - - #define NORM_FREQ_LEN 32 - |