summaryrefslogtreecommitdiff
path: root/package/psmisc/psmisc.mk
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2012-03-28 23:25:01 -0300
committerPeter Korsgaard <jacmet@sunsite.dk>2012-03-29 23:56:01 +0200
commit953b0f4de8ebcb5b42c8da760c025873ce82550d (patch)
tree0932fe35f36f802ab76c76ae40161fff2c4d7b6e /package/psmisc/psmisc.mk
parent13ee02d0635005a8a3e917cf29d5b277328d6df5 (diff)
psmisc: bump to version 22.16
[Peter: Don't disable stack protection if toolchain has ssp support] Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/psmisc/psmisc.mk')
-rw-r--r--package/psmisc/psmisc.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk
index df116fc94..0b0e0465c 100644
--- a/package/psmisc/psmisc.mk
+++ b/package/psmisc/psmisc.mk
@@ -4,10 +4,15 @@
#
#############################################################
-PSMISC_VERSION = 22.14
-PSMISC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/psmisc
+PSMISC_VERSION = 22.16
+PSMISC_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/psmisc/psmisc
PSMISC_DEPENDENCIES = ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+ifneq ($(BR2_TOOLCHAIN_BUILDROOT_USE_SSP),y)
+# Don't force -fstack-protector
+PSMISC_CONF_OPT = --disable-harden-flags
+endif
+
# build after busybox, we prefer fat versions while we're at it
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
PSMISC_DEPENDENCIES += busybox