Add Package: htop

Buildroot Andy Kennedy 2 participants 4 messages Mar 22, 2011

lore

Share & tools

lore

Andy Kennedy

author

2011-03-22 15:18 UTC #0 lore raw

Adds package htop. This is a resubmit, with corrections.

Signed-off-by Andy Kennedy <[email protected]>

---

package/Config.in 2011-03-21 17:29:22.000000000 -0500 renamed from package/Config.in 2011-03-14 10:39:51.000000000 -0500 +3 -0

diff -Naur a/package/Config.in b/package/Config.in
@@ -476,6 +476,9 @@
 menu "System tools"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/bootutils/Config.in"
+endif
+source "package/htop/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/module-init-tools/Config.in"
 source "package/procps/Config.in"
 source "package/psmisc/Config.in"

package/htop/Config.in 2011-03-21 17:29:22.000000000 -0500 renamed from package/htop/Config.in 1969-12-31 18:00:00.000000000 -0600 +8 -0

diff -Naur a/package/htop/Config.in b/package/htop/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_HTOP
+       bool "htop"
+       select BR2_PACKAGE_NCURSES
+       help
+         htop is an interactive text-mode process viewer for Linux.
+         It aims to be a better top.
+
+         http://sourceforge.net/projects/htop/

package/htop/htop-alloc-not-void.patch 2011-03-21 18:09:45.000000000 -0500 renamed from package/htop/htop-alloc-not-void.patch 1969-12-31 18:00:00.000000000 -0600 +21 -0

diff -Naur a/package/htop/htop-alloc-not-void.patch b/package/htop/htop-alloc-not-void.patch
@@ -0,0 +1,21 @@
+diff -Naur a/configure b/configure
+--- a/configure        2010-11-23 10:33:53.000000000 -0600
++++ b/configure        2011-03-21 18:05:46.000000000 -0500
+@@ -12363,7 +12363,7 @@
+ #if defined STDC_HEADERS || defined HAVE_STDLIB_H
+ # include <stdlib.h>
+ #else
+-char *malloc ();
++void *malloc ();
+ #endif
+
+ int
+@@ -12598,7 +12598,7 @@
+ #if defined STDC_HEADERS || defined HAVE_STDLIB_H
+ # include <stdlib.h>
+ #else
+-char *realloc ();
++void *realloc ();
+ #endif
+
+ int

package/htop/htop-cross-no-proc-check.patch 2011-03-22 09:57:22.000000000 -0500 renamed from package/htop/htop-cross-no-proc-check.patch 1969-12-31 18:00:00.000000000 -0600 +22 -0

diff -Naur a/package/htop/htop-cross-no-proc-check.patch b/package/htop/htop-cross-no-proc-check.patch
@@ -0,0 +1,22 @@
+# This patch removes the checks for /proc when cross compiling.
+# We hope you know what you are doing and you have /proc, doesn't everyone?
+# Signed-of-by:  Andy Kennedy <[email protected]>
+diff -Naur a/configure b/configure
+--- a/configure 2010-11-23 10:33:53.000000000 -0600
++++ b/configure 2011-03-22 09:52:46.000000000 -0500
+@@ -13605,6 +13605,7 @@
+
+
+
++if test "$cross_compiling" = no ; then
+ as_ac_File=`echo "ac_cv_file_$PROCDIR/stat" | $as_tr_sh`
+ { echo "$as_me:$LINENO: checking for $PROCDIR/stat" >&5
+ echo $ECHO_N "checking for $PROCDIR/stat... $ECHO_C" >&6; }
+@@ -13658,6 +13659,7 @@
+ echo "$as_me: error: Cannot find /proc/meminfo. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
++fi #cross_compiling = no (Andy Kennedy)
+
+
+ # Check whether --enable-plpa was given.

package/htop/htop-make-execinfo-detectable.patch 2011-03-21 17:29:22.000000000 -0500 renamed from package/htop/htop-make-execinfo-detectable.patch 1969-12-31 18:00:00.000000000 -0600 +59 -0

59 lines not on this page · raw message

package/htop/htop.mk 2011-03-22 09:31:54.000000000 -0500 renamed from package/htop/htop.mk 1969-12-31 18:00:00.000000000 -0600 +17 -0

diff -Naur a/package/htop/htop.mk b/package/htop/htop.mk
@@ -0,0 +1,17 @@
+#############################################################
+#
+# htop
+#
+#############################################################
+HTOP_VERSION = 0.9
+HTOP_SOURCE = htop-$(HTOP_VERSION).tar.gz
+HTOP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/htop/$(HTOP_VERSION)
+HTOP_DEPENDENCIES = ncurses
+
+HTOP_POST_CONFIGURE_HOOKS = HTOP_RETOUCH_CONFIGURE_AC
+
+define HTOP_RETOUCH_CONFIGURE_AC
+       touch -r $(@D)/missing $(@D)/configure.ac
+endef
+
+$(eval $(call AUTOTARGETS,package,htop))

Mike Frysinger

2011-03-22 15:38 UTC #1 lore raw

Quoted 12 lines · Andy Kennedy

package/htop/htop-alloc-not-void.patch ? ?2011-03-21 18:09:45.000000000 -0500 renamed from package/htop/htop-alloc-not-void.patch ? ?1969-12-31 18:00:00.000000000 -0600 +9 -0
@@ -0,0 +1,21 @@
+diff -Naur a/configure b/configure
+--- a/configure ? ? ? ?2010-11-23 10:33:53.000000000 -0600
++++ b/configure ? ? ? ?2011-03-21 18:05:46.000000000 -0500
+@@ -12363,7 +12363,7 @@
+ #if defined STDC_HEADERS || defined HAVE_STDLIB_H
+ # include <stdlib.h>
+ #else
+-char *malloc ();
++void *malloc ();

package/htop/htop-alloc-not-void.patch ? ?2011-03-21 18:09:45.000000000 -0500 line 19

Quoted 10 lines

package/htop/htop-alloc-not-void.patch ? ?2011-03-21 18:09:45.000000000 -0500 renamed from package/htop/htop-alloc-not-void.patch ? ?1969-12-31 18:00:00.000000000 -0600 +10 -0
+ #endif
+
+ int
+@@ -12598,7 +12598,7 @@
+ #if defined STDC_HEADERS || defined HAVE_STDLIB_H
+ # include <stdlib.h>
+ #else
+-char *realloc ();
++void *realloc ();
+ #endif

why do you need to patch this ? HAVE_STDLIB_H should be defined, or something else is broken.

package/htop/htop-alloc-not-void.patch ? ?2011-03-21 18:09:45.000000000 -0500 line 21

Quoted 2 lines

package/htop/htop-alloc-not-void.patch ? ?2011-03-21 18:09:45.000000000 -0500 renamed from package/htop/htop-alloc-not-void.patch ? ?1969-12-31 18:00:00.000000000 -0600 +2 -0
+--- a/configure
++++ b/configure

so you patch configure ...

Quoted 2 lines

+--- a/configure.ac
++++ b/configure.ac

then you patch configure.ac ...

package/htop/htop-alloc-not-void.patch ? ?2011-03-21 18:09:45.000000000 -0500

Quoted 5 lines

package/htop/htop-alloc-not-void.patch ? ?2011-03-21 18:09:45.000000000 -0500 renamed from package/htop/htop-alloc-not-void.patch ? ?1969-12-31 18:00:00.000000000 -0600 +5 -0
+HTOP_POST_CONFIGURE_HOOKS = HTOP_RETOUCH_CONFIGURE_AC
+
+define HTOP_RETOUCH_CONFIGURE_AC
+ ? ? ? touch -r $(@D)/missing $(@D)/configure.ac
+endef

and then you manually touch configure.ac, but dont invoke autotools anywhere. what is going on here ?

you should only be patching generated files, or only the source autotool files. and if you do the latter, you should be re-running autotools via HTOP_AUTORECONF=yes, not manually mucking with timestamps and letting the build system figure things out. -mike

ANDY KENNEDY

author

2011-03-22 16:01 UTC #2 lore raw

Quoted 25 lines

-----Original Message-----
From: vapierfilter at gmail.com [mailto:vapierfilter at gmail.com] On Behalf Of Mike Frysinger
Sent: Tuesday, March 22, 2011 10:39 AM
To: ANDY KENNEDY
Cc: buildroot at busybox.net
Subject: Re: [Buildroot] Add Package: htop
Quoted 17 lines · Andy Kennedy
package/htop/htop-alloc-not-void.patch ? ?2011-03-21 18:09:45.000000000 -0500 renamed from package/htop/htop-alloc-not-void.patch ? ?1969-12-31 18:00:00.000000000 -0600 +14 -0
@@ -0,0 +1,21 @@
+diff -Naur a/configure b/configure
+--- a/configure ? ? ? ?2010-11-23 10:33:53.000000000 -0600
++++ b/configure ? ? ? ?2011-03-21 18:05:46.000000000 -0500
+@@ -12363,7 +12363,7 @@
+ #if defined STDC_HEADERS || defined HAVE_STDLIB_H
+ # include <stdlib.h>
+ #else
+-char *malloc ();
++void *malloc ();
+ #endif
+
+ int
+@@ -12598,7 +12598,7 @@
+ #if defined STDC_HEADERS || defined HAVE_STDLIB_H

Quoted 8 lines

package/htop/htop-alloc-not-void.patch ? ?2011-03-21 18:09:45.000000000 -0500 line 19
Quoted 5 lines
package/htop/htop-alloc-not-void.patch ? ?2011-03-21 18:09:45.000000000 -0500 renamed from package/htop/htop-alloc-not-void.patch ? ?1969-12-31 18:00:00.000000000 -0600 +5 -0
+ # include <stdlib.h>
+ #else
+-char *realloc ();
++void *realloc ();
+ #endif
why do you need to patch this ? HAVE_STDLIB_H should be defined, or something else is broken.

Ah crap! I didn't mean that to be in there. That was leftovers from when I was attempting to fix the issue of automake not being the correct version (they have it hard-coded to 1.10, mine is 1.11). Though. . .

Quoted 11 lines

package/htop/htop-alloc-not-void.patch ? ?2011-03-21 18:09:45.000000000 -0500 line 21
Quoted 3 lines
package/htop/htop-alloc-not-void.patch ? ?2011-03-21 18:09:45.000000000 -0500 renamed from package/htop/htop-alloc-not-void.patch ? ?1969-12-31 18:00:00.000000000 -0600 +2 -0
+--- a/configure
++++ b/configure
so you patch configure ...
Quoted 2 lines
+--- a/configure.ac
++++ b/configure.ac
then you patch configure.ac ...

Quoted 8 lines

package/htop/htop-alloc-not-void.patch ? ?2011-03-21 18:09:45.000000000 -0500
Quoted 5 lines
package/htop/htop-alloc-not-void.patch ? ?2011-03-21 18:09:45.000000000 -0500 renamed from package/htop/htop-alloc-not-void.patch ? ?1969-12-31 18:00:00.000000000 -0600 +5 -0
+HTOP_POST_CONFIGURE_HOOKS = HTOP_RETOUCH_CONFIGURE_AC
+
+define HTOP_RETOUCH_CONFIGURE_AC
+ ? ? ? touch -r $(@D)/missing $(@D)/configure.ac
+endef
and then you manually touch configure.ac, but dont invoke autotools anywhere. what is going on here ?

if you touch the configure.ac file using the timestamp off of missing, you don't _need_ to rerun the automake if the configure.ac is near the same time as missing and configure. This would be a hack. Perhaps I should mention that in the patch file?

Quoted 5 lines

you should only be patching generated files, or only the source autotool files. and if you do the latter, you should be re-running autotools via HTOP_AUTORECONF=yes, not manually mucking with timestamps and letting the build system figure things out.

I'm confused about this (forgive my ignorance about the overall build system). So, if I let configure run, then let make run it fails. However, I can go back and rm .stamp_configured and re-run make then all is well. So, if I do HTOP_AUTORECONF, will this do this for me?

Quoted 1 line

-mike

Andy

Mike Frysinger

2011-03-22 16:09 UTC #3 lore raw

Quoted 21 lines · ANDY KENNEDY

From: vapierfilter at gmail.com [mailto:vapierfilter at gmail.com] On Behalf Of Mike Frysinger
Quoted 11 lines · Andy Kennedy
Quoted 2 lines
+--- a/configure
++++ b/configure
so you patch configure ...
Quoted 2 lines
+--- a/configure.ac
++++ b/configure.ac
then you patch configure.ac ...
Quoted 8 lines
package/htop/htop.mk 2011-03-22 09:31:54.000000000 -0500 line 15
Quoted 5 lines
package/htop/htop.mk 2011-03-22 09:31:54.000000000 -0500 renamed from package/htop/htop.mk 1969-12-31 18:00:00.000000000 -0600 +5 -0
+HTOP_POST_CONFIGURE_HOOKS = HTOP_RETOUCH_CONFIGURE_AC
+
+define HTOP_RETOUCH_CONFIGURE_AC
+ ? ? ? touch -r $(@D)/missing $(@D)/configure.ac
+endef
and then you manually touch configure.ac, but dont invoke autotools anywhere. ?what is going on here ?

Quoted 4 lines

if you touch the configure.ac file using the timestamp off of missing, you don't _need_ to rerun the automake if the configure.ac is near the same time as missing and configure. ?This would be a hack. ?Perhaps I should mention that in the patch file?

sorry, i missed the -r. this begs the question of why are you patching configure.ac at all then if you try and prevent autotools from running. any changes made to configure.ac wont be reflected in configure and other files if autoconf/etc... arent run.

Quoted 9 lines

Quoted 4 lines
you should only be patching generated files, or only the source autotool files. ?and if you do the latter, you should be re-running autotools via HTOP_AUTORECONF=yes, not manually mucking with timestamps and letting the build system figure things out.
I'm confused about this (forgive my ignorance about the overall build system). ?So, if I let configure run, then let make run it fails. However, I can go back and rm .stamp_configured and re-run make then all is well. ?So, if I do HTOP_AUTORECONF, will this do this for me?

the vague description sounds like autotool problems and you should be using autoreconf.
-mike