psmisc 21.8: Update for uClibc. psmisc requires libintl on uClibc which it

correctly determines in the configure script but fails to actually use.
Patch Makefile.am to link to libintl if it determines that it's required.
Has no effect on the glibc build. Also added virtual/libintl to the DEPENDS.

diff --git a/packages/psmisc/psmisc-21.8/libintl-link.patch b/packages/psmisc/psmisc-21.8/libintl-link.patch
new file mode 100644 (file)
index 0000000..d9cdd90
--- /dev/null
+++ b/packages/psmisc/psmisc-21.8/libintl-link.patch
@@ -0,0 +1,29 @@
+uClibc needs to link against an external libintl but it doesn't do this by
+default. The configure script correctly figures out if this is needed, but
+doesn't actually link to the libraries it decides on. This makes it link to
+them if they are needed:
+
+--- psmisc-22.2/src/Makefile.am        2006/06/28 00:14:07     1.1
++++ psmisc-22.2/src/Makefile.am        2006/06/28 00:14:24
+@@ -5,15 +5,19 @@
+ 
+ oldfuser_SOURCES = oldfuser.c comm.h signals.c signals.h loop.h i18n.h
+ 
++oldfuser_LDADD = @INTLLIBS@
++
+ fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h
+ 
++fuser_LDADD = @INTLLIBS@
++
+ killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h
+ 
+-killall_LDADD = @SELINUX_LIB@
++killall_LDADD = @SELINUX_LIB@ @INTLLIBS@
+ 
+ pstree_SOURCES = pstree.c comm.h i18n.h
+ 
+-pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@
++pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ @INTLLIBS@
+ 
+ BUILT_SOURCES = signames.h
+ 

diff --git a/packages/psmisc/psmisc_21.8.bb b/packages/psmisc/psmisc_21.8.bb
index 4d10633..f7d6828 100644 (file)
--- a/packages/psmisc/psmisc_21.8.bb
+++ b/packages/psmisc/psmisc_21.8.bb
@@ -3,11 +3,12 @@ DESCRIPTION = "procfs tools"
 SECTION = "base"
 PRIORITY = "required"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "ncurses"
-PR = "r0"
+DEPENDS = "ncurses virtual/libintl"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \
-          file://signames-header-fix.patch;patch=1"
+          file://signames-header-fix.patch;patch=1 \
+          file://libintl-link.patch;patch=1"
 S = "${WORKDIR}/psmisc-${PV}"
 
 inherit autotools gettext