diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-12-01 13:48:04 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-02 15:14:01 +0000 |
commit | 1131efec323dc380252cabf60e1c6a8e8a353bbd (patch) | |
tree | 7424597feccaf7ecba24e2a050f767abe2b50d3d /meta/recipes-extended/psmisc/files | |
parent | 338f90982e1b4d00dece751964fef8a02d25f298 (diff) | |
download | poky-1131efec323dc380252cabf60e1c6a8e8a353bbd.tar.gz |
psmisc: Update to 22.14
* Create psmisc-extras for unpackaged binaries
* rebase patch
* set LICENSE to GPLv2
(From OE-Core rev: db339e1955ea95f9a3dd3c65677bad6b6e7fa0ea)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/psmisc/files')
-rw-r--r-- | meta/recipes-extended/psmisc/files/libintl-link.patch | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/meta/recipes-extended/psmisc/files/libintl-link.patch b/meta/recipes-extended/psmisc/files/libintl-link.patch index 698d98a23f..e42592ca2e 100644 --- a/meta/recipes-extended/psmisc/files/libintl-link.patch +++ b/meta/recipes-extended/psmisc/files/libintl-link.patch | |||
@@ -6,25 +6,27 @@ default. The configure script correctly figures out if this is needed, but | |||
6 | doesn't actually link to the libraries it decides on. This makes it link to | 6 | doesn't actually link to the libraries it decides on. This makes it link to |
7 | them if they are needed: | 7 | them if they are needed: |
8 | 8 | ||
9 | --- psmisc-22.13/src/Makefile.am | 9 | Index: psmisc-22.14/src/Makefile.am |
10 | +++ psmisc-22.13/src/Makefile.am | 10 | =================================================================== |
11 | @@ -25,16 +25,17 @@ endif | 11 | --- psmisc-22.14.orig/src/Makefile.am 2011-06-20 04:59:44.000000000 -0700 |
12 | +++ psmisc-22.14/src/Makefile.am 2011-12-01 10:19:55.792680654 -0800 | ||
13 | @@ -26,15 +26,17 @@ | ||
12 | 14 | ||
15 | fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h lists.h | ||
13 | 16 | ||
14 | fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h | ||
15 | +fuser_LDADD = @INTLLIBS@ | 17 | +fuser_LDADD = @INTLLIBS@ |
16 | 18 | + | |
17 | killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h | 19 | killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h |
18 | 20 | ||
19 | -killall_LDADD = @SELINUX_LIB@ | 21 | -killall_LDADD = @SELINUX_LIB@ |
20 | +killall_LDADD = @SELINUX_LIB@ @INTLLIBS@ | 22 | +killall_LDADD = @SELINUX_LIB@ @INTLLIBS@ |
21 | 23 | ||
22 | peekfd_SOURCES = peekfd.c | 24 | peekfd_SOURCES = peekfd.c |
23 | 25 | ||
24 | pstree_SOURCES = pstree.c comm.h i18n.h | 26 | pstree_SOURCES = pstree.c comm.h i18n.h |
25 | 27 | ||
26 | -pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ | 28 | -pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ |
27 | +pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ @INTLLIBS@ | 29 | +pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ @INTLLIBS@ |
28 | 30 | ||
29 | prtstat_SOURCES = prtstat.c prtstat.h | 31 | prtstat_SOURCES = prtstat.c prtstat.h |
30 | 32 | ||