diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-11-23 14:41:36 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-11-23 14:41:36 +0100 |
| commit | 7ba54a07d42825e06292c09a34de4490929506b9 (patch) | |
| tree | e95af931d66cddf23939d5c1ccabf0faf8915b02 /package/psmisc | |
| parent | bba2fd540bc211bbcea1ad1dfc552fe32021097d (diff) | |
psmisc: bump version and fix build
./configure in psmisc 22.6 tested for a working C++ compiler and errored out
if not found, even though psmisc doesn't need it - Fixed in 22.8.
pstree.c uses __progname for pstree.x11 support, which isn't (per default)
available in uclibc. This stuff isn't really critical, so just disable it.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/psmisc')
| -rw-r--r-- | package/psmisc/psmisc-no-__progname.patch | 24 | ||||
| -rw-r--r-- | package/psmisc/psmisc.mk | 6 |
2 files changed, 27 insertions, 3 deletions
diff --git a/package/psmisc/psmisc-no-__progname.patch b/package/psmisc/psmisc-no-__progname.patch new file mode 100644 index 000000000..82e6daf77 --- /dev/null +++ b/package/psmisc/psmisc-no-__progname.patch @@ -0,0 +1,24 @@ +[PATCH]: pstree: don't use glibc-specific __progname + +uclibc (per default) doesn't implement __progname, and the pstree.x11 +stuff isn't that critical, so just disable it. + +Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> +--- + src/pstree.c | 3 --- + 1 file changed, 3 deletions(-) + +Index: psmisc-22.8/src/pstree.c +=================================================================== +--- psmisc-22.8.orig/src/pstree.c ++++ psmisc-22.8/src/pstree.c +@@ -893,9 +893,6 @@ main (int argc, char **argv) + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); + #endif +- +- if (!strcmp(__progname, "pstree.x11")) +- wait_end=1; + + /* + * Attempt to figure out a good default symbol set. Will be overriden by diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk index 90a5186dd..9276b0845 100644 --- a/package/psmisc/psmisc.mk +++ b/package/psmisc/psmisc.mk @@ -3,11 +3,11 @@ # psmisc # ############################################################# -PSMISC_VERSION:=22.6 +PSMISC_VERSION:=22.8 PSMISC_SOURCE:=psmisc-$(PSMISC_VERSION).tar.gz PSMISC_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/psmisc -PSMISC_AUTORECONF:=no -PSMISC_INSTALL_STAGING:=no +PSMISC_AUTORECONF:=NO +PSMISC_INSTALL_STAGING:=NO PSMISC_INSTALL_TARGET:=YES PSMISC_CONF_ENV:=ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes |