package/atop: update to 2.11.0
PATCH 1/1 package/atop: update to 2.11.0
See here for a changelog:
https://atoptool.nl/downloadatop.php
Fixes:
- http://autobuild.buildroot.net/results/4f2/4f256c96c8b7c34c1f1be378ad3a535d3150e44d
Signed-off-by Waldemar Brodkorb <[email protected]>
--- ...he-user-to-pass-additional-CFLAGS-an.patch | 21 +++++++++---------- package/atop/atop.hash | 2 +- package/atop/atop.mk | 4 +++- 3 files changed, 14 insertions(+), 13 deletions(-)
package/atop/0001-Makefile-allow-the-user-to-pass-additional-CFLAGS-an.patch +10 -11
@@ -8,26 +8,25 @@ This is needed for some build systems. For example, Buildroot needs to disable optimizations on some CPU architectures. Upstream: https://github.com/Atoptool/atop/pull/314 +[Waldemar: rebase on top of 2.11.0] +Signed-off-by: Waldemar Brodkorb <[email protected]> Signed-off-by: Thomas Petazzoni <[email protected]> --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index a6f196b..dae5cda 100644 +index 3a63f69..ab44eaa 100644 --- a/Makefile +++ b/Makefile -@@ -20,8 +20,8 @@ PMPATH1 = /usr/lib/pm-utils/sleep.d - PMPATH2 = /usr/lib64/pm-utils/sleep.d +@@ -21,8 +21,8 @@ PMPATH2 = /usr/lib64/pm-utils/sleep.d PMPATHD = /usr/lib/systemd/system-sleep --CFLAGS += -O2 -I. -Wall $(shell pkg-config --cflags glib-2.0) -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT # -DHTTPSTATS --LDFLAGS = $(shell pkg-config --libs glib-2.0) -+override CFLAGS := -O2 -I. -Wall $(shell pkg-config --cflags glib-2.0) -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security $(CFLAGS) # -DNOPERFEVENT # -DHTTPSTATS -+override LDFLAGS := $(shell pkg-config --libs glib-2.0) $(LDFLAGS) + PKG_CONFIG ?= pkg-config +-CFLAGS += -O2 -I. -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0) -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT # -DHTTPSTATS +-LDFLAGS += $(shell $(PKG_CONFIG) --libs glib-2.0) ++override CFLAGS += -O2 -I. -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0) -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT # -DHTTPSTATS ++override LDFLAGS += $(shell $(PKG_CONFIG) --libs glib-2.0) OBJMOD0 = version.o OBJMOD1 = various.o deviate.o procdbase.o - OBJMOD2 = acctproc.o photoproc.o photosyst.o rawlog.o ifprop.o parseable.o --- -2.45.2 - + OBJMOD2 = acctproc.o photoproc.o photosyst.o cgroups.o rawlog.o ifprop.o parseable.o
package/atop/atop.hash +1 -1
@@ -1,5 +1,5 @@ # Locally computed: -sha256 e7a673cf2c82578e7dd82ecb0dec83fd9ecb30828b2561c28a9fa5aaf75d5f93 atop-2.10.0.tar.gz +sha256 9b94c666602efff7bf402ecce706c347f38c39cb63498f9d39626861e5646e20 atop-2.11.0.tar.gz # Hash for license file: sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING
package/atop/atop.mk +3 -1
@@ -4,13 +4,15 @@ # ################################################################################ -ATOP_VERSION = 2.10.0 +ATOP_VERSION = 2.11.0 ATOP_SITE = http://www.atoptool.nl/download ATOP_LICENSE = GPL-2.0+ ATOP_LICENSE_FILES = COPYING ATOP_CPE_ID_VALID = YES ATOP_DEPENDENCIES = ncurses zlib libglib2 host-pkgconf +ATOP_MAKE_FLAGS = PKG_CONFIG=$(PKG_CONFIG_HOST_BINARY) + ATOP_CFLAGS = $(TARGET_CFLAGS) ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
Signature · 6 lines
2.39.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Hello Waldemar,
Quoted 1 line · On Sat, 10 Aug 2024 08:14:18 +0200 Waldemar Brodkorb <[email protected]> wrote:
+ATOP_MAKE_FLAGS = PKG_CONFIG=$(PKG_CONFIG_HOST_BINARY)
Instead of this, could you try to change ATOP_BUILD_CMDS as such:
$(TARGET_MAKE_ENV) $(MAKE) ...
this should allow the Makefile to find our pkg-config correctly.
Thanks!
Thomas
Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot