A report on Gentoo's bug tracker (https://bugs.gentoo.org/show_bug.cgi?id=505366) notes that while the configure script support --disable-nls, the nls code is not conditionally disabled which causes build failures on uclibc. This patch from René Rhéaume fixes the affected code:

- --- powertop-2.5/src/lib.h +++ powertop-2.5-nls/src/lib.h @@ -33,7 +33,11 @@ #include "config.h" #endif +#ifdef ENABLE_NLS #define _(STRING) gettext(STRING) +#else +#define _(STRING) (STRING) +#endif #define POWERTOP_VERSION "v"PACKAGE_VERSION #define POWERTOP_SHORT_VERSION PACKAGE_VERSION - --- powertop-2.5/src/main.cpp +++ powertop-2.5-nls/src/main.cpp @@ -369,8 +369,10 @@ int main(int argc, char **argv) set_new_handler(out_of_memory); setlocale (LC_ALL, ""); +#ifdef ENABLE_NLS bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); +#endif while (1) { /* parse commandline options */ c = getopt_long (argc, argv, "ch:C:i:t:uVw:q", long_options, &option_index); - --- powertop-2.5/src/report/report-maker.h +++ powertop-2.5-nls/src/report/report-maker.h @@ -75,8 +75,13 @@ #include <string> /* Conditional gettext. We need original strings for CSV. */ +#ifdef ENABLE_NLS #define __(STRING) \ ((report.get_type() == REPORT_CSV) ? (STRING) : gettext(STRING)) +#else +#define __(STRING) (STRING) +#endif + #ifndef UNUSED #define UNUSED __attribute__((unused)) original patch: https://505366.bugs.gentoo.org/attachment.cgi?id=373272 Please accept this patch. Thanks, Zero _______________________________________________ PowerTop mailing list PowerTop(a)lists.01.org https://lists.01.org/mailman/listinfo/powertop

> On (04/16/14 11:21), Rick "Zero_Chaos" Farina wrote: >> A report on Gentoo's bug tracker >> (https://bugs.gentoo.org/show_bug.cgi?id=505366) notes that while the >> configure script support --disable-nls, the nls code is not >> conditionally disabled which causes build failures on uclibc. This >> patch from René Rhéaume fixes the affected code: >> > > looks good. > > -ss > >> - --- powertop-2.5/src/lib.h >> +++ powertop-2.5-nls/src/lib.h >> @@ -33,7 +33,11 @@ >> #include "config.h" >> #endif >> >> +#ifdef ENABLE_NLS >> #define _(STRING) gettext(STRING) >> +#else >> +#define _(STRING) (STRING) >> +#endif >> >> #define POWERTOP_VERSION "v"PACKAGE_VERSION >> #define POWERTOP_SHORT_VERSION PACKAGE_VERSION >> - --- powertop-2.5/src/main.cpp >> +++ powertop-2.5-nls/src/main.cpp >> @@ -369,8 +369,10 @@ int main(int argc, char **argv) >> set_new_handler(out_of_memory); >> >> setlocale (LC_ALL, ""); >> +#ifdef ENABLE_NLS >> bindtextdomain (PACKAGE, LOCALEDIR); >> textdomain (PACKAGE); >> +#endif >> >> while (1) { /* parse commandline options */ >> c = getopt_long (argc, argv, "ch:C:i:t:uVw:q", long_options, >> &option_index); >> - --- powertop-2.5/src/report/report-maker.h >> +++ powertop-2.5-nls/src/report/report-maker.h >> @@ -75,8 +75,13 @@ >> #include <string> >> >> /* Conditional gettext. We need original strings for CSV. */ >> +#ifdef ENABLE_NLS >> #define __(STRING) \ >> ((report.get_type() == REPORT_CSV) ? (STRING) : gettext(STRING)) >> +#else >> +#define __(STRING) (STRING) >> +#endif >> + >> >> #ifndef UNUSED >> #define UNUSED __attribute__((unused)) >> >> >> original patch: https://505366.bugs.gentoo.org/attachment.cgi?id=373272 >> >> Please accept this patch. >> >> Thanks, >> Zero I'm having issues adding this patch to the repo. I get error: Patch is empty. Was it split wrong? Sergey, did you have any problems applying this patch to your branch? Rick, please check your patch and send it?