sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

psmisc: Update to version 22.16 

Remove libintl-link patch which has in the upstream code now

(From OE-Core rev: f3aad7c3a88dbe171147a703b98488c00a615fcf)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold 2012-02-27 00:46:58 -08:00 committed by Richard Purdie
parent debd4da669
commit 86d3f776aa
4 changed files with 9 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
meta/recipes-extended/psmisc/files/libintl-link.patch
View File

@ -1,32 +0,0 @@
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Mei Lei <lei.mei@intel.com>
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:
Index: psmisc-22.14/src/Makefile.am
===================================================================
--- psmisc-22.14.orig/src/Makefile.am 2011-06-20 04:59:44.000000000 -0700
+++ psmisc-22.14/src/Makefile.am 2011-12-01 10:19:55.792680654 -0800
@@ -26,15 +26,17 @@
fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h lists.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@
peekfd_SOURCES = peekfd.c
pstree_SOURCES = pstree.c comm.h i18n.h
-pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@
+pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ @INTLLIBS@
prtstat_SOURCES = prtstat.c prtstat.h

4
meta/recipes-extended/psmisc/psmisc.inc
View File

@ -9,8 +9,8 @@ SECTION = "base"
DEPENDS = "ncurses virtual/libintl"
LICENSE = "GPLv2"
SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \
file://libintl-link.patch"
SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz"
S = "${WORKDIR}/psmisc-${PV}"
inherit autotools gettext

7
meta/recipes-extended/psmisc/psmisc_22.14.bb
View File

@ -1,7 +0,0 @@
require psmisc.inc
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
PR = "r0"
SRC_URI[md5sum] = "ba3f4e971895c92bba7770d81c981503"
SRC_URI[sha256sum] = "22bbf4561837af475c0d8d14e3b9cab453998c787212c107fac7faf2f281e26e"

7
meta/recipes-extended/psmisc/psmisc_22.16.bb Normal file
View File

@ -0,0 +1,7 @@
require psmisc.inc
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
PR = "r0"
SRC_URI[md5sum] = "d52caf26159c905574c2ce4bd792b9ee"
SRC_URI[sha256sum] = "ae426d7238e5353fdf51b1d313897c2bbed0023e66e5b4af2be9cd03d87a9d01"