psmisc-link-against-libintl.patch 1.8 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243
  1. Link against libintl if needed
  2. When built against a C library that has locale support, but for which
  3. intl support is provided by an external libintl library, psmisc
  4. forgets to link against this library, even though the configure script
  5. properly checks that.
  6. This patch therefore ensure that we link against libintl when needed,
  7. thanks to the @INTLLIBS@ variable provided by the configure script.
  8. We do not modify the Makefile.am file, because autoreconfiguring this
  9. package doesn't work: because of its usage of gettext, it wants to run
  10. the "autopoint" program, which itself depends on CVS being installed,
  11. for some strange reasons. That's the reason why we fall back to the
  12. hacky solution of modifying the Makefile.in file.
  13. It replaces a hack which was mistakenly removed by commit
  14. 542fbe8520c981f9c96705a57e4263f34f2ab2e6.
  15. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  16. Index: psmisc-22.13/src/Makefile.in
  17. ===================================================================
  18. --- psmisc-22.13.orig/src/Makefile.in 2011-05-21 15:12:17.212412293 +0200
  19. +++ psmisc-22.13/src/Makefile.in 2011-05-21 16:08:50.220326032 +0200
  20. @@ -216,12 +216,15 @@
  21. $(am__append_4) $(am__append_6) $(am__append_8) \
  22. $(am__append_10)
  23. fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h
  24. +fuser_LDADD = @INTLLIBS@
  25. killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h
  26. -killall_LDADD = @SELINUX_LIB@
  27. +killall_LDADD = @SELINUX_LIB@ @INTLLIBS@
  28. peekfd_SOURCES = peekfd.c
  29. +peekfd_LDADD = @INTLLIBS@
  30. pstree_SOURCES = pstree.c comm.h i18n.h
  31. -pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@
  32. +pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ @INTLLIBS@
  33. prtstat_SOURCES = prtstat.c prtstat.h
  34. +prtstat_LDADD = @INTLLIBS@
  35. BUILT_SOURCES = signames.h
  36. EXTRA_DIST = signames.c
  37. CLEANFILES = signames.h