htop: Link with libubacktrace when compiling for uclibc
PATCH 1/2 htop: Link with libubacktrace when compiling for uclibc
Signed-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-support/htop/htop_0.9.bb | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
meta-oe/recipes-support/htop/htop_0.9.bb +4 -0
@@ -9,9 +9,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c312653532e8e669f30e5ec8bdc23be3" DEPENDS = "ncurses" RDEPENDS_${PN} = "ncurses-terminfo" +PR = "r1" + SRC_URI = "${SOURCEFORGE_MIRROR}/htop/htop-${PV}.tar.gz \ file://remove-proc-test.patch" +LDFLAGS_append_libc-uclibc = " -lubacktrace" + inherit autotools SRC_URI[md5sum] = "7c5507f35f363f3f40183a2ba3c561f8"
Signature · 1 line
1.7.4.1
PATCH 2/2 cpufrequtils: Fix compilation on uclibc
We make nls optional
Signed-off-by Khem Raj <[email protected]>
--- .../cpufrequtils-008/cpufrequtils-nls.patch | 81 ++++++++++++++++++++ .../cpufrequtils/cpufrequtils_008.bb | 6 +- 2 files changed, 86 insertions(+), 1 deletions(-) create mode 100644 meta-oe/recipes-support/cpufrequtils/cpufrequtils-008/cpufrequtils-nls.patch
meta-oe/recipes-support/cpufrequtils/cpufrequtils-008/cpufrequtils-nls.patch new file +81 -0
@@ -0,0 +1,81 @@ +make nls/gettext support optional + +patch by Jos van der Ende <[email protected]> + +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 +
meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb +5 -1
@@ -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"
Signature · 1 line
1.7.4.1