summaryrefslogtreecommitdiff
path: root/sys-process/atop/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-05-22 07:31:18 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-05-22 07:31:18 +0100
commit908778078736bd36f7a60a2d576d415cb8e000fa (patch)
treec6a4796c48b608c14dc7e9674cdbd38f905e3c15 /sys-process/atop/files
parent185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)
gentoo resync : 22.05.2021
Diffstat (limited to 'sys-process/atop/files')
-rw-r--r--sys-process/atop/files/atop-2.2-build.patch27
-rw-r--r--sys-process/atop/files/atop-2.2-sysmacros.patch14
-rw-r--r--sys-process/atop/files/atop-2.4.0-build.patch22
-rw-r--r--sys-process/atop/files/atop-2.5.0-install_fix.patch31
4 files changed, 0 insertions, 94 deletions
diff --git a/sys-process/atop/files/atop-2.2-build.patch b/sys-process/atop/files/atop-2.2-build.patch
deleted file mode 100644
index 70840a25330a..000000000000
--- a/sys-process/atop/files/atop-2.2-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- atop-2.2-3/Makefile
-+++ atop-2.2-3/Makefile
-@@ -19,7 +19,7 @@
- PMPATH2 = /usr/lib64/pm-utils/sleep.d
- PMPATHD = /usr/lib/systemd/system-sleep
-
--CFLAGS += -O2 -I. -Wall # -DHTTPSTATS
-+CFLAGS += -I. -Wall # -DHTTPSTATS
- OBJMOD0 = version.o
- OBJMOD1 = various.o deviate.o procdbase.o
- OBJMOD2 = acctproc.o photoproc.o photosyst.o rawlog.o ifprop.o parseable.o
-@@ -32,13 +32,13 @@
- all: atop atopsar atopacctd
-
- atop: atop.o $(ALLMODS) Makefile
-- $(CC) atop.o $(ALLMODS) -o atop -lncurses -lz -lm -lrt $(LDFLAGS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) atop.o $(ALLMODS) -o atop $(shell ${PKG_CONFIG} --libs ncurses) -lz -lm -lrt
-
- atopsar: atop
- ln -sf atop atopsar
-
- atopacctd: atopacctd.o netlink.o
-- $(CC) atopacctd.o netlink.o -o atopacctd $(LDFLAGS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) atopacctd.o netlink.o -o atopacctd
-
- netlink.o: netlink.c
- $(CC) -I. -Wall -c netlink.c
diff --git a/sys-process/atop/files/atop-2.2-sysmacros.patch b/sys-process/atop/files/atop-2.2-sysmacros.patch
deleted file mode 100644
index 87fd069c8fdb..000000000000
--- a/sys-process/atop/files/atop-2.2-sysmacros.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/580372
-
-include sys/sysmacros.h for major/minor prototypes
-
---- a/photosyst.c
-+++ b/photosyst.c
-@@ -164,6 +164,7 @@
- #include <signal.h>
- #include <string.h>
- #include <dirent.h>
-+#include <sys/sysmacros.h>
-
- #include <sys/socket.h>
- #include <netinet/in.h>
diff --git a/sys-process/atop/files/atop-2.4.0-build.patch b/sys-process/atop/files/atop-2.4.0-build.patch
deleted file mode 100644
index 73fd41691299..000000000000
--- a/sys-process/atop/files/atop-2.4.0-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- atop-2.4.0/Makefile
-+++ atop-2.4.0/Makefile
-@@ -33,16 +33,16 @@
-
- atop: atop.o $(ALLMODS) Makefile
- $(CC) -c version.c
-- $(CC) atop.o $(ALLMODS) -o atop -lncurses -lz -lm -lrt $(LDFLAGS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) atop.o $(ALLMODS) -o atop $(shell ${PKG_CONFIG} --libs ncurses) -lz -lm -lrt
-
- atopsar: atop
- ln -sf atop atopsar
-
- atopacctd: atopacctd.o netlink.o
-- $(CC) atopacctd.o netlink.o -o atopacctd $(LDFLAGS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) atopacctd.o netlink.o -o atopacctd
-
- atopconvert: atopconvert.o
-- $(CC) atopconvert.o -o atopconvert -lz $(LDFLAGS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) atopconvert.o -o atopconvert -lz
-
- netlink.o: netlink.c
- $(CC) -I. -Wall -c netlink.c
diff --git a/sys-process/atop/files/atop-2.5.0-install_fix.patch b/sys-process/atop/files/atop-2.5.0-install_fix.patch
deleted file mode 100644
index b46e88c76f3c..000000000000
--- a/sys-process/atop/files/atop-2.5.0-install_fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 485a453d2ae5700874a57dffc297030254b5ae7c Mon Sep 17 00:00:00 2001
-From: BlackEagle <ike.devolder@gmail.com>
-Date: Mon, 4 Nov 2019 09:00:54 +0100
-Subject: [PATCH] DEFPATH not created so touch fails
-
-```
-touch /build/atop/pkg/atop/etc/default/atop
-touch: cannot touch '/build/atop/pkg/atop/etc/default/atop': No such file or directory
-```
-
-Add DEFPATH mkdir in genericinstall to make sure the folder
-`$(DESTDIR)/etc/default` exits
-
-Signed-off-by: BlackEagle <ike.devolder@gmail.com>
----
- Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 929b0d7..a662fd6 100644
---- a/Makefile
-+++ b/Makefile
-@@ -140,6 +140,8 @@ sysvinstall: genericinstall
- genericinstall: atop atopacctd atopconvert
- if [ ! -d $(DESTDIR)$(LOGPATH) ]; \
- then mkdir -p $(DESTDIR)$(LOGPATH); fi
-+ if [ ! -d $(DESTDIR)$(DEFPATH) ]; \
-+ then mkdir -p $(DESTDIR)$(DEFPATH); fi
- if [ ! -d $(DESTDIR)$(BINPATH) ]; \
- then mkdir -p $(DESTDIR)$(BINPATH); fi
- if [ ! -d $(DESTDIR)$(SBINPATH) ]; \