Commit a872ee46 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

psmisc: bump to version 22.14

parent 933693d8
Loading
Loading
Loading
Loading
+28 −14
Original line number Diff line number Diff line
@@ -14,30 +14,44 @@ the "autopoint" program, which itself depends on CVS being installed,
for some strange reasons. That's the reason why we fall back to the
hacky solution of modifying the Makefile.in file.

It replaces a hack which was mistakenly removed by commit
542fbe8520c981f9c96705a57e4263f34f2ab2e6.
Forward-ported Thomas's patch to psmisc 22.14
from commit f066ed70cd6939838d4057f66798cbc1d972cc73

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Index: psmisc-22.13/src/Makefile.in
===================================================================
--- psmisc-22.13.orig/src/Makefile.in	2011-05-21 15:12:17.212412293 +0200
+++ psmisc-22.13/src/Makefile.in	2011-05-21 16:08:50.220326032 +0200
@@ -216,12 +216,15 @@
 	$(am__append_4) $(am__append_6) $(am__append_8) \
diff -Nura psmisc-22.14.orig/src/Makefile.in psmisc-22.14/src/Makefile.in
--- psmisc-22.14.orig/src/Makefile.in	2011-10-12 12:12:09.711983726 -0300
+++ psmisc-22.14/src/Makefile.in	2011-10-12 12:14:01.733350322 -0300
@@ -70,16 +70,16 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_fuser_OBJECTS = fuser.$(OBJEXT) signals.$(OBJEXT)
 fuser_OBJECTS = $(am_fuser_OBJECTS)
-fuser_LDADD = $(LDADD)
+fuser_LDADD = $(LDADD) @INTLLIBS@
 am_killall_OBJECTS = killall.$(OBJEXT) signals.$(OBJEXT)
 killall_OBJECTS = $(am_killall_OBJECTS)
 killall_DEPENDENCIES =
 am_peekfd_OBJECTS = peekfd.$(OBJEXT)
 peekfd_OBJECTS = $(am_peekfd_OBJECTS)
-peekfd_LDADD = $(LDADD)
+peekfd_LDADD = $(LDADD) @INTLLIBS@
 am_prtstat_OBJECTS = prtstat.$(OBJEXT)
 prtstat_OBJECTS = $(am_prtstat_OBJECTS)
-prtstat_LDADD = $(LDADD)
+prtstat_LDADD = $(LDADD) @INTLLIBS@
 am_pstree_OBJECTS = pstree.$(OBJEXT)
 pstree_OBJECTS = $(am_pstree_OBJECTS)
 pstree_DEPENDENCIES =
@@ -217,10 +217,10 @@
 	$(am__append_10)
 fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h
+fuser_LDADD = @INTLLIBS@
 fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h lists.h
 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
+peekfd_LDADD = @INTLLIBS@
 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
+prtstat_LDADD = @INTLLIBS@
 BUILT_SOURCES = signames.h
 EXTRA_DIST = signames.c 
 CLEANFILES = signames.h
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
#
#############################################################

PSMISC_VERSION = 22.13
PSMISC_VERSION = 22.14
PSMISC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/psmisc
PSMISC_DEPENDENCIES = ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)