summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/psmisc/files
diff options
context:
space:
mode:
authorMei Lei <lei.mei@intel.com>2011-04-12 10:40:00 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-18 10:59:07 +0100
commitda398f759a7c63369cfd0c8eb92ca1dc3be1472d (patch)
tree1b17711b562f5bdca856a614547bc1265edf960b /meta/recipes-extended/psmisc/files
parent70402b3c8bae6d4d22e4b91011a85dfe9d95d601 (diff)
downloadopenembedded-core-da398f759a7c63369cfd0c8eb92ca1dc3be1472d.tar.gz
openembedded-core-da398f759a7c63369cfd0c8eb92ca1dc3be1472d.tar.bz2
openembedded-core-da398f759a7c63369cfd0c8eb92ca1dc3be1472d.zip
psmisc: Upgrade from 22.2 to 22.13
Modify the libintl-link.patch because the upstream removed old fuser in 22.7 Signed-off-by: Mei Lei <lei.mei@intel.com>
Diffstat (limited to 'meta/recipes-extended/psmisc/files')
-rw-r--r--meta/recipes-extended/psmisc/files/libintl-link.patch27
1 files changed, 14 insertions, 13 deletions
diff --git a/meta/recipes-extended/psmisc/files/libintl-link.patch b/meta/recipes-extended/psmisc/files/libintl-link.patch
index d9cdd90d71..698d98a23f 100644
--- a/meta/recipes-extended/psmisc/files/libintl-link.patch
+++ b/meta/recipes-extended/psmisc/files/libintl-link.patch
@@ -1,29 +1,30 @@
+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:
---- 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 @@
+--- psmisc-22.13/src/Makefile.am
++++ psmisc-22.13/src/Makefile.am
+@@ -25,16 +25,17 @@ endif
- 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@
-
+
+ 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@
-
- BUILT_SOURCES = signames.h
+
+ prtstat_SOURCES = prtstat.c prtstat.h