[Buildroot] [pull request] Pull request for branch for-2011.05/psmisc-fix

[Buildroot] [pull request] Pull request for branch for-2011.05/psmisc-fix

[Thomas Petazzoni]

The following changes since commit a02cfbf1f4a82ee6582e2bf7622b2bf105359ea9:

  bind: give path to OpenSSL when OpenSSL is enabled (2011-05-19 20:03:35 +0200)

are available in the git repository at:
  http://free-electrons.com/~thomas/buildroot.git for-2011.05/psmisc-fix

Thomas Petazzoni (2):
      psmisc: fix build by linking against libintl when needed
      psmisc: do not install pstree.x11 symbolic link

 package/psmisc/psmisc-link-against-libintl.patch |   43 ++++++++++++++++++++++
 package/psmisc/psmisc-no-__progname.patch        |   23 ++++++++++--
 2 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 package/psmisc/psmisc-link-against-libintl.patch

Thanks,
-- 
Thomas Petazzoni

[Buildroot] [PATCH 1/2] psmisc: fix build by linking against libintl when needed

[Thomas Petazzoni]

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/psmisc/psmisc-link-against-libintl.patch |   43 ++++++++++++++++++++++
 1 files changed, 43 insertions(+), 0 deletions(-)
 create mode 100644 package/psmisc/psmisc-link-against-libintl.patch

diff --git a/package/psmisc/psmisc-link-against-libintl.patch b/package/psmisc/psmisc-link-against-libintl.patch
new file mode 100644
index 0000000..985e232
--- /dev/null
+++ b/package/psmisc/psmisc-link-against-libintl.patch
@@ -0,0 +1,43 @@
+Link against libintl if needed
+
+When built against a C library that has locale support, but for which
+intl support is provided by an external libintl library, psmisc
+forgets to link against this library, even though the configure script
+properly checks that.
+
+This patch therefore ensure that we link against libintl when needed,
+thanks to the @INTLLIBS@ variable provided by the configure script.
+
+We do not modify the Makefile.am file, because autoreconfiguring this
+package doesn't work: because of its usage of gettext, it wants to run
+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.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+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) \
+ 	$(am__append_10)
+ 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
++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.7.1

[Buildroot] [PATCH 2/2] psmisc: do not install pstree.x11 symbolic link

[Thomas Petazzoni]

The psmisc-no-__progname.patch removes the usage of __progname, which
removes any difference between pstree and pstree.x11. Therefore, we
make sure to not create the pstree.x11 symbolic link in the target.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/psmisc/psmisc-no-__progname.patch |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/package/psmisc/psmisc-no-__progname.patch b/package/psmisc/psmisc-no-__progname.patch
index 063b120..5109657 100644
--- a/package/psmisc/psmisc-no-__progname.patch
+++ b/package/psmisc/psmisc-no-__progname.patch
@@ -5,10 +5,12 @@ stuff isn't that critical, so just disable it.
 
 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 
-diff -Nura psmisc-22.13.orig/src/pstree.c psmisc-22.13/src/pstree.c
---- psmisc-22.13.orig/src/pstree.c	2010-07-12 08:10:03.000000000 -0300
-+++ psmisc-22.13/src/pstree.c	2011-01-07 15:02:41.902741728 -0300
+Index: psmisc-22.13/src/pstree.c
+===================================================================
+--- psmisc-22.13.orig/src/pstree.c	2010-07-12 13:10:03.000000000 +0200
++++ psmisc-22.13/src/pstree.c	2011-05-21 16:33:37.456530775 +0200
 @@ -49,8 +49,6 @@
  #include <selinux/selinux.h>
  #endif                                /*WITH_SELINUX */
@@ -28,3 +30,18 @@ diff -Nura psmisc-22.13.orig/src/pstree.c psmisc-22.13/src/pstree.c
      /*
       * Attempt to figure out a good default symbol set.  Will be overriden by
       * command-line options, if given.
+Index: psmisc-22.13/src/Makefile.in
+===================================================================
+--- psmisc-22.13.orig/src/Makefile.in	2011-05-21 16:33:42.748530777 +0200
++++ psmisc-22.13/src/Makefile.in	2011-05-21 16:33:47.360530782 +0200
+@@ -557,10 +557,6 @@
+ 		grep '^{ 1,"HUP" },$$' signames.h >/dev/null || \
+ 		  { rm -f signames.h; exit 1; }
+ 
+-install-exec-hook:
+-		cd $(DESTDIR)$(bindir) && \
+-			( [ -h pstree.x11 ]  || $(LN_S) pstree pstree.x11)
+-
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
-- 
1.7.1

[Buildroot] [pull request] Pull request for branch for-2011.05/psmisc-fix

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> The following changes since commit a02cfbf1f4a82ee6582e2bf7622b2bf105359ea9:
 Thomas>   bind: give path to OpenSSL when OpenSSL is enabled (2011-05-19 20:03:35 +0200)

 Thomas> are available in the git repository at:
 Thomas>   http://free-electrons.com/~thomas/buildroot.git for-2011.05/psmisc-fix

 Thomas> Thomas Petazzoni (2):
 Thomas>       psmisc: fix build by linking against libintl when needed
 Thomas>       psmisc: do not install pstree.x11 symbolic link

Committed, thanks.

-- 
Bye, Peter Korsgaard