mirror of
https://github.com/openwrt/packages.git
synced 2025-12-24 08:28:20 +04:00
atop: update to 2.6.0
Reordered some stuff in the Makefile for consistency between packages. Refreshed patches. Added a musl fix. Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
@@ -1,22 +1,11 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 3bf5929..e065577 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -32,7 +32,7 @@ VERS = $(shell ./atop -V 2>/dev/null| sed -e 's/^[^ ]* //' -e 's/ .*//')
|
||||
all: atop atopsar atopacctd atopconvert
|
||||
@@ -33,7 +33,7 @@ VERS = $(shell ./atop -V 2>/dev/null
|
||||
all: atop atopsar atopacctd atopconvert atopcat
|
||||
|
||||
atop: atop.o $(ALLMODS) Makefile
|
||||
- $(CC) -c version.c
|
||||
+ $(CC) $(CFLAGS) -c version.c
|
||||
$(CC) atop.o $(ALLMODS) -o atop -lncurses -lz -lm -lrt $(LDFLAGS)
|
||||
- $(CC) atop.o $(ALLMODS) -o atop -lncursesw -lz -lm -lrt $(LDFLAGS)
|
||||
+ $(CC) $(CFLAGS) atop.o $(ALLMODS) -o atop -lncursesw -lz -lm -lrt $(LDFLAGS)
|
||||
|
||||
atopsar: atop
|
||||
@@ -45,7 +45,7 @@ atopconvert: atopconvert.o
|
||||
$(CC) atopconvert.o -o atopconvert -lz $(LDFLAGS)
|
||||
|
||||
netlink.o: netlink.c
|
||||
- $(CC) -I. -Wall -c netlink.c
|
||||
+ $(CC) $(CFLAGS) -I. -Wall -c netlink.c
|
||||
|
||||
clean:
|
||||
rm -f *.o atop atopacctd atopconvert
|
||||
ln -sf atop atopsar
|
||||
|
||||
Reference in New Issue
Block a user