commit: 2217cdf56cb81085933c4c373178c154f58f8c72 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Aug 12 17:51:33 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Aug 12 17:52:02 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2217cdf5
sys-process/atop: fix patches for 2.10.0 Closes: https://bugs.gentoo.org/937830 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch | 4 ++-- sys-process/atop/files/atop-2.10.0-respect-opt.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch b/sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch index edfa88c7a889..483506043490 100644 --- a/sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch +++ b/sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch @@ -7,8 +7,8 @@ -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) +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) ++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) OBJMOD0 = version.o OBJMOD1 = various.o deviate.o procdbase.o OBJMOD2 = acctproc.o photoproc.o photosyst.o rawlog.o ifprop.o parseable.o diff --git a/sys-process/atop/files/atop-2.10.0-respect-opt.patch b/sys-process/atop/files/atop-2.10.0-respect-opt.patch index 2acb4ec53f51..5a55e6f2f835 100644 --- a/sys-process/atop/files/atop-2.10.0-respect-opt.patch +++ b/sys-process/atop/files/atop-2.10.0-respect-opt.patch @@ -5,8 +5,8 @@ Don't force -O2. PMPATHD = /usr/lib/systemd/system-sleep 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 -+CFLAGS += -I. -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0) -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT # -DHTTPSTATS +-CFLAGS += -O2 -I. -Wall $(shell ${PKG_CONFIG} --cflags glib-2.0) -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT # -DHTTPSTATS ++CFLAGS += -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) OBJMOD0 = version.o OBJMOD1 = various.o deviate.o procdbase.o
