diff options
author | Saul Wold <sgw@linux.intel.com> | 2012-02-27 00:46:58 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-28 12:27:47 +0000 |
commit | 86d3f776aa3a6bf5e9d10dff97295dc20484feb0 (patch) | |
tree | b7eedbac86df45e0e3cc2f022ca80c443d1702f2 /meta/recipes-extended/psmisc/files | |
parent | debd4da669ac312207652d4f5e56d35a3cac1202 (diff) | |
download | poky-86d3f776aa3a6bf5e9d10dff97295dc20484feb0.tar.gz |
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>
Diffstat (limited to 'meta/recipes-extended/psmisc/files')
-rw-r--r-- | meta/recipes-extended/psmisc/files/libintl-link.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/meta/recipes-extended/psmisc/files/libintl-link.patch b/meta/recipes-extended/psmisc/files/libintl-link.patch deleted file mode 100644 index e42592ca2e..0000000000 --- a/meta/recipes-extended/psmisc/files/libintl-link.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | Signed-off-by: Mei Lei <lei.mei@intel.com> | ||
3 | |||
4 | uClibc needs to link against an external libintl but it doesn't do this by | ||
5 | 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 | ||
7 | them if they are needed: | ||
8 | |||
9 | Index: psmisc-22.14/src/Makefile.am | ||
10 | =================================================================== | ||
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 @@ | ||
14 | |||
15 | fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h lists.h | ||
16 | |||
17 | +fuser_LDADD = @INTLLIBS@ | ||
18 | + | ||
19 | killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h | ||
20 | |||
21 | -killall_LDADD = @SELINUX_LIB@ | ||
22 | +killall_LDADD = @SELINUX_LIB@ @INTLLIBS@ | ||
23 | |||
24 | peekfd_SOURCES = peekfd.c | ||
25 | |||
26 | pstree_SOURCES = pstree.c comm.h i18n.h | ||
27 | |||
28 | -pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ | ||
29 | +pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ @INTLLIBS@ | ||
30 | |||
31 | prtstat_SOURCES = prtstat.c prtstat.h | ||
32 | |||