diff options
author | Mei Lei <lei.mei@intel.com> | 2011-04-12 10:40:00 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-19 18:05:51 +0100 |
commit | 903806a0bf1f24397716b9bc62b3f228515e4ada (patch) | |
tree | 54d9db6f0c660e88f01aefa60423d863563cd236 /meta/recipes-extended/psmisc/files | |
parent | 1d3d3aa2867895c1d81e8ee31e12b5960c6ce30c (diff) | |
download | poky-903806a0bf1f24397716b9bc62b3f228515e4ada.tar.gz |
psmisc: Upgrade from 22.2 to 22.13
Modify the libintl-link.patch because the upstream removed old fuser in 22.7
(From OE-Core rev: da398f759a7c63369cfd0c8eb92ca1dc3be1472d)
Signed-off-by: Mei Lei <lei.mei@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 | 27 |
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 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | Signed-off-by: Mei Lei <lei.mei@intel.com> | ||
3 | |||
1 | uClibc needs to link against an external libintl but it doesn't do this by | 4 | uClibc needs to link against an external libintl but it doesn't do this by |
2 | default. The configure script correctly figures out if this is needed, but | 5 | default. The configure script correctly figures out if this is needed, but |
3 | 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 |
4 | them if they are needed: | 7 | them if they are needed: |
5 | 8 | ||
6 | --- psmisc-22.2/src/Makefile.am 2006/06/28 00:14:07 1.1 | 9 | --- psmisc-22.13/src/Makefile.am |
7 | +++ psmisc-22.2/src/Makefile.am 2006/06/28 00:14:24 | 10 | +++ psmisc-22.13/src/Makefile.am |
8 | @@ -5,15 +5,19 @@ | 11 | @@ -25,16 +25,17 @@ endif |
9 | 12 | ||
10 | oldfuser_SOURCES = oldfuser.c comm.h signals.c signals.h loop.h i18n.h | ||
11 | 13 | ||
12 | +oldfuser_LDADD = @INTLLIBS@ | ||
13 | + | ||
14 | fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h | 14 | fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h |
15 | |||
16 | +fuser_LDADD = @INTLLIBS@ | 15 | +fuser_LDADD = @INTLLIBS@ |
17 | + | 16 | |
18 | killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h | 17 | killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h |
19 | 18 | ||
20 | -killall_LDADD = @SELINUX_LIB@ | 19 | -killall_LDADD = @SELINUX_LIB@ |
21 | +killall_LDADD = @SELINUX_LIB@ @INTLLIBS@ | 20 | +killall_LDADD = @SELINUX_LIB@ @INTLLIBS@ |
22 | 21 | ||
22 | peekfd_SOURCES = peekfd.c | ||
23 | |||
23 | pstree_SOURCES = pstree.c comm.h i18n.h | 24 | pstree_SOURCES = pstree.c comm.h i18n.h |
24 | 25 | ||
25 | -pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ | 26 | -pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ |
26 | +pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ @INTLLIBS@ | 27 | +pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ @INTLLIBS@ |
27 | 28 | ||
28 | BUILT_SOURCES = signames.h | 29 | prtstat_SOURCES = prtstat.c prtstat.h |
29 | 30 | ||