diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2011-07-02 00:36:11 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2011-07-01 19:35:53 +0200 |
| commit | e4aef8aaae26d52530ca95394c395c6eca84168d (patch) | |
| tree | c31a29620da0111eded40adbd1dbeceb4024434c | |
| parent | 7e3451f4e7352cc2c48711170e6a1be7c15e973e (diff) | |
| download | meta-openembedded-contrib-e4aef8aaae26d52530ca95394c395c6eca84168d.tar.gz | |
cpufrequtils: Fix compilation on uclibc
We make nls optional
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
| -rw-r--r-- | meta-oe/recipes-support/cpufrequtils/cpufrequtils-008/cpufrequtils-nls.patch | 81 | ||||
| -rw-r--r-- | meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb | 6 |
2 files changed, 86 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/cpufrequtils/cpufrequtils-008/cpufrequtils-nls.patch b/meta-oe/recipes-support/cpufrequtils/cpufrequtils-008/cpufrequtils-nls.patch new file mode 100644 index 0000000000..cbc87194df --- /dev/null +++ b/meta-oe/recipes-support/cpufrequtils/cpufrequtils-008/cpufrequtils-nls.patch @@ -0,0 +1,81 @@ +make nls/gettext support optional + +patch by Jos van der Ende <seraph@xs4all.nl> + +http://bugs.gentoo.org/205576 + +Index: git/Makefile +=================================================================== +--- git.orig/Makefile 2011-06-30 17:50:23.000000000 -0700 ++++ git/Makefile 2011-07-01 07:06:58.300033928 -0700 +@@ -121,6 +121,7 @@ + ifeq ($(strip $(NLS)),true) + INSTALL_NLS += install-gmo + COMPILE_NLS += update-gmo ++ CFLAGDEF += -DNLS + endif + + ifeq ($(strip $(CPUFRQ_BENCH)),true) +Index: git/utils/info.c +=================================================================== +--- git.orig/utils/info.c 2011-06-30 17:50:23.000000000 -0700 ++++ git/utils/info.c 2011-07-01 07:06:58.300033928 -0700 +@@ -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 + +Index: git/utils/set.c +=================================================================== +--- git.orig/utils/set.c 2011-06-30 17:50:23.000000000 -0700 ++++ git/utils/set.c 2011-07-01 07:07:56.980119994 -0700 +@@ -12,16 +12,23 @@ + #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 + diff --git a/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb b/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb index a28ab831be..d795e54d78 100644 --- a/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb +++ b/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb @@ -6,7 +6,11 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRCREV = "adb7e044755aa06b12212d05c4acbcccb023d2cd" -SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/cpufreq/cpufrequtils.git" +SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/cpufreq/cpufrequtils.git \ + file://cpufrequtils-nls.patch \ + " + +PR = "r1" S = "${WORKDIR}/git" |