summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2024-08-11 22:01:27 +0100
committerSam James <sam@gentoo.org>2024-08-11 22:14:21 +0100
commit9447f32d8725376b2d3f3865717e7302bc50d3cd (patch)
tree77a5e14713241b3bc58af1427f161c8222679616
parentsys-process/atop: crank copyright (diff)
downloadgentoo-9447f32d8725376b2d3f3865717e7302bc50d3cd.tar.gz
gentoo-9447f32d8725376b2d3f3865717e7302bc50d3cd.tar.bz2
gentoo-9447f32d8725376b2d3f3865717e7302bc50d3cd.zip
sys-process/atop: tweak PKG_CONFIG patch
This matches the upstream version more closely. Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch4
-rw-r--r--sys-process/atop/files/atop-2.10.0-respect-opt.patch4
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 483506043490..edfa88c7a889 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 5a55e6f2f835..2acb4ec53f51 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