psmic: locale support

Closes #4274.

diff --git a/package/psmisc/Config.in b/package/psmisc/Config.in
index a9f71b95439b2690a1bc35d72f30fee6be563669..e7ce7046192dc438cd3e3a5f16645f39a94601e4 100644 (file)
--- a/package/psmisc/Config.in
+++ b/package/psmisc/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_PSMISC
        bool "psmisc"
        select BR2_PACKAGE_NCURSES
+       select BR2_PACKAGE_GETTEXT if BR2_ENABLE_LOCALE
+       select BR2_PACKAGE_LIBINTL if BR2_ENABLE_LOCALE
        help
          Helpful /proc related utilities such as pstree, fuser, and killall
 

diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk
index b2ec834f962cee603485cc6c81b91727940d000e..e89214748786d71c07dc7999da2b3b43eed1a633 100644 (file)
--- a/package/psmisc/psmisc.mk
+++ b/package/psmisc/psmisc.mk
@@ -15,4 +15,10 @@ PSMISC_CONF_ENV:=ac_cv_func_malloc_0_nonnull=yes \
 PSMISC_CONF_OPT:= $(DISABLE_NLS) $(DISABLE_IPV6)
 PSMISC_DEPENDENCIES:=uclibc ncurses
 
+ifeq ($(BR2_ENABLE_LOCALE),y)
+# psmisc gets confused and forgets to link with libintl
+PSMISC_MAKE_OPT:=LIBS=-lintl
+PSMISC_DEPENDENCIES+= gettext libintl
+endif
+
 $(eval $(call AUTOTARGETS,package,psmisc))