[ptxdist] [PATCH] htop: version bump 3.0.1 -> 3.1.2

[ptxdist] [PATCH] htop: version bump 3.0.1 -> 3.1.2

[Philipp Zabel]

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 patches/{htop-3.0.1 => htop-3.1.2}/autogen.sh |  0
 rules/htop.make                               | 24 ++++++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)
 rename patches/{htop-3.0.1 => htop-3.1.2}/autogen.sh (100%)

diff --git a/patches/htop-3.0.1/autogen.sh b/patches/htop-3.1.2/autogen.sh
similarity index 100%
rename from patches/htop-3.0.1/autogen.sh
rename to patches/htop-3.1.2/autogen.sh
diff --git a/rules/htop.make b/rules/htop.make
index 06c64718fa9a..39e8cc3978b2 100644
--- a/rules/htop.make
+++ b/rules/htop.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_HTOP) += htop
 #
 # Paths and names
 #
-HTOP_VERSION	:= 3.0.1
-HTOP_MD5	:= c09908bacb5e22454715547aed88c3af
+HTOP_VERSION	:= 3.1.2
+HTOP_MD5	:= 2177554fcc3a5390f85313fae3729d7d
 HTOP		:= htop-$(HTOP_VERSION)
 HTOP_SUFFIX	:= tar.gz
 HTOP_URL	:= https://github.com/htop-dev/htop/archive/$(HTOP_VERSION).$(HTOP_SUFFIX)
@@ -37,16 +37,22 @@ HTOP_CONF_ENV	:= \
 HTOP_CONF_TOOL	:= autoconf
 HTOP_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
+	--disable-pcp \
+	--disable-unicode \
+	--enable-affinity \
+	--disable-unwind \
+	--disable-hwloc \
 	--disable-openvz \
-	--enable-cgroup \
 	--disable-vserver \
 	--disable-ancient-vserver \
-	--enable-taskstats \
-	--disable-unicode \
-	--enable-linux-affinity \
-	--disable-hwloc \
-	--disable-setuid \
-	--disable-delayacct
+	--enable-vserver \
+	--enable-capabilities \
+	--disable-delayacct \
+	--disable-sensors \
+	--enable-werror \
+	--enable-debug \
+	--with-os-release=/etc/os-release \
+	--with-proc=/proc
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH] htop: version bump 3.0.1 -> 3.1.2

[Michael Olbrich]

On Mon, Mar 07, 2022 at 03:21:20PM +0100, Philipp Zabel wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>

I'm getting a lot of errors here:

On ARMv7:

Action.c: In function 'Action_pickFromVector':
Action.c:70:36: error: cast increases required alignment of target type [-Werror=cast-align]
Action.c: In function 'tagAllChildren':
Action.c:123:20: error: cast increases required alignment of target type [-Werror=cast-align]
Action.c: In function 'expandCollapse':
Action.c:131:17: error: cast increases required alignment of target type [-Werror=cast-align]
Action.c: In function 'collapseIntoParent':
Action.c:140:23: error: cast increases required alignment of target type [-Werror=cast-align]
Action.c:146:20: error: cast increases required alignment of target type [-Werror=cast-align]
Action.c: In function 'actionSetAffinity':
Action.c:315:23: error: cast increases required alignment of target type [-Werror=cast-align]
Action.c: In function 'actionLsof':
Action.c:394:23: error: cast increases required alignment of target type [-Werror=cast-align]
Action.c: In function 'actionShowLocks':
Action.c:407:23: error: cast increases required alignment of target type [-Werror=cast-align]
Action.c: In function 'actionStrace':
Action.c:422:23: error: cast increases required alignment of target type [-Werror=cast-align]
Action.c: In function 'actionTag':
Action.c:438:17: error: cast increases required alignment of target type [-Werror=cast-align]
Action.c: In function 'actionUntagAll':
Action.c:618:20: error: cast increases required alignment of target type [-Werror=cast-align]
Action.c: In function 'actionTagAllChildren':
Action.c:625:17: error: cast increases required alignment of target type [-Werror=cast-align]
Action.c: In function 'actionShowEnvScreen':
Action.c:634:17: error: cast increases required alignment of target type [-Werror=cast-align]
Action.c: In function 'actionShowCommandScreen':
Action.c:647:17: error: cast increases required alignment of target type [-Werror=cast-align]
cc1: all warnings being treated as errors
make[1]: *** [Makefile:1473: Action.o] Error 1

on ARMv8:

ColumnsPanel.c: In function 'ColumnsPanel_eventHandler':
ColumnsPanel.c:60:13: error: this statement may fall through [-Werror=implicit-fallthrough=]
ColumnsPanel.c:65:7: note: here
ColumnsPanel.c:76:13: error: this statement may fall through [-Werror=implicit-fallthrough=]
ColumnsPanel.c:81:7: note: here
cc1: all warnings being treated as errors

This may be icecc related. If there are fallthrough comments, then add:

HTOP_CFLAGS := -Wno-error=implicit-fallthrough

And in another build in the prepare stage:

checking for cap_init in -lcap... no
configure: error: can not find required library libcap

Either add the dependency or build with --disable-capabilities.

Michael

> ---
>  patches/{htop-3.0.1 => htop-3.1.2}/autogen.sh |  0
>  rules/htop.make                               | 24 ++++++++++++-------
>  2 files changed, 15 insertions(+), 9 deletions(-)
>  rename patches/{htop-3.0.1 => htop-3.1.2}/autogen.sh (100%)
> 
> diff --git a/patches/htop-3.0.1/autogen.sh b/patches/htop-3.1.2/autogen.sh
> similarity index 100%
> rename from patches/htop-3.0.1/autogen.sh
> rename to patches/htop-3.1.2/autogen.sh
> diff --git a/rules/htop.make b/rules/htop.make
> index 06c64718fa9a..39e8cc3978b2 100644
> --- a/rules/htop.make
> +++ b/rules/htop.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_HTOP) += htop
>  #
>  # Paths and names
>  #
> -HTOP_VERSION	:= 3.0.1
> -HTOP_MD5	:= c09908bacb5e22454715547aed88c3af
> +HTOP_VERSION	:= 3.1.2
> +HTOP_MD5	:= 2177554fcc3a5390f85313fae3729d7d
>  HTOP		:= htop-$(HTOP_VERSION)
>  HTOP_SUFFIX	:= tar.gz
>  HTOP_URL	:= https://github.com/htop-dev/htop/archive/$(HTOP_VERSION).$(HTOP_SUFFIX)
> @@ -37,16 +37,22 @@ HTOP_CONF_ENV	:= \
>  HTOP_CONF_TOOL	:= autoconf
>  HTOP_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
> +	--disable-pcp \
> +	--disable-unicode \
> +	--enable-affinity \
> +	--disable-unwind \
> +	--disable-hwloc \
>  	--disable-openvz \
> -	--enable-cgroup \
>  	--disable-vserver \
>  	--disable-ancient-vserver \
> -	--enable-taskstats \
> -	--disable-unicode \
> -	--enable-linux-affinity \
> -	--disable-hwloc \
> -	--disable-setuid \
> -	--disable-delayacct
> +	--enable-vserver \
> +	--enable-capabilities \
> +	--disable-delayacct \
> +	--disable-sensors \
> +	--enable-werror \
> +	--enable-debug \
> +	--with-os-release=/etc/os-release \
> +	--with-proc=/proc
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install
> -- 
> 2.30.2
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de