Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-process/atop/files: atop-2.1-build.patch
Date: Sun, 30 Nov 2014 13:47:21
Message-Id: 20141130134718.6F3E3B394@oystercatcher.gentoo.org
1 polynomial-c 14/11/30 13:47:18
2
3 Added: atop-2.1-build.patch
4 Log:
5 Version bump (bug #531212). Removed old
6
7 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
8
9 Revision Changes Path
10 1.1 sys-process/atop/files/atop-2.1-build.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/atop/files/atop-2.1-build.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/atop/files/atop-2.1-build.patch?rev=1.1&content-type=text/plain
14
15 Index: atop-2.1-build.patch
16 ===================================================================
17 --- atop-2.1/Makefile
18 +++ atop-2.1/Makefile
19 @@ -17,7 +17,7 @@
20 PMPATH1 = /usr/lib/pm-utils/sleep.d
21 PMPATH2 = /usr/lib64/pm-utils/sleep.d
22
23 -CFLAGS += -O2 -I. -Wall # -DHTTPSTATS
24 +CFLAGS += -I. -Wall # -DHTTPSTATS
25 OBJMOD0 = version.o
26 OBJMOD1 = various.o deviate.o procdbase.o
27 OBJMOD2 = acctproc.o photoproc.o photosyst.o rawlog.o ifprop.o parseable.o
28 @@ -30,13 +30,13 @@
29 all: atop atopsar atopacctd
30
31 atop: atop.o $(ALLMODS) Makefile
32 - $(CC) atop.o $(ALLMODS) -o atop -lncurses -lz -lm -lrt $(LDFLAGS)
33 + $(CC) $(CFLAGS) $(LDFLAGS) atop.o $(ALLMODS) -o atop -lncurses -lz -lm -lrt
34
35 atopsar: atop
36 ln -sf atop atopsar
37
38 atopacctd: atopacctd.o netlink.o
39 - $(CC) atopacctd.o netlink.o -o atopacctd $(LDFLAGS)
40 + $(CC) $(CFLAGS) $(LDFLAGS) atopacctd.o netlink.o -o atopacctd
41
42 netlink.o: netlink.c
43 $(CC) -I. -Wall -c netlink.c
44 @@ -49,6 +49,8 @@
45 then mkdir -p $(DESTDIR)$(LOGPATH); fi
46 if [ ! -d $(DESTDIR)$(BINPATH) ]; \
47 then mkdir -p $(DESTDIR)$(BINPATH); fi
48 + if [ ! -d $(DESTDIR)$(SBINPATH) ]; \
49 + then mkdir -p $(DESTDIR)$(SBINPATH); fi
50 if [ ! -d $(DESTDIR)$(SCRPATH) ]; \
51 then mkdir -p $(DESTDIR)$(SCRPATH); fi
52 if [ ! -d $(DESTDIR)$(MAN1PATH) ]; \