jer 14/07/21 19:01:50 Modified: nethogs-0.8.0-gentoo.patch Log: Use CXXFLAGS not CFLAGS (bug #517706). (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.2 net-analyzer/nethogs/files/nethogs-0.8.0-gentoo.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nethogs/files/nethogs-0.8.0-gentoo.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nethogs/files/nethogs-0.8.0-gentoo.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nethogs/files/nethogs-0.8.0-gentoo.patch?r1=1.1&r2=1.2 Index: nethogs-0.8.0-gentoo.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nethogs/files/nethogs-0.8.0-gentoo.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nethogs-0.8.0-gentoo.patch 17 Feb 2014 00:44:37 -0000 1.1 +++ nethogs-0.8.0-gentoo.patch 21 Jul 2014 19:01:50 -0000 1.2 @@ -14,7 +14,7 @@ -CFLAGS=-g -Wall -Wextra -#CFLAGS=-O2 -+CFLAGS+= -Wall -Wextra ++CXXFLAGS+= -Wall -Wextra OBJS=packet.o connection.o process.o refresh.o decpcap.o cui.o inode2prog.o conninode.o devices.o + +LIBS = $(shell $(PKG_CONFIG) --libs ncurses) @@ -22,19 +22,49 @@ .PHONY: tgz tgz: clean -@@ -30,12 +32,12 @@ +@@ -30,33 +32,33 @@ install -m 644 nethogs.8 $(man8) nethogs: nethogs.cpp $(OBJS) - $(CXX) $(CFLAGS) nethogs.cpp $(OBJS) -o nethogs -lpcap -lm -lncurses -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\" -+ $(CXX) $(CFLAGS) $(LDFLAGS) nethogs.cpp $(OBJS) -o nethogs -lpcap -lm $(LIBS) -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\" ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) nethogs.cpp $(OBJS) -o nethogs -lpcap -lm $(LIBS) -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\" nethogs_testsum: nethogs_testsum.cpp $(OBJS) - $(CXX) $(CFLAGS) -g nethogs_testsum.cpp $(OBJS) -o nethogs_testsum -lpcap -lm -lncurses -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\" -+ $(CXX) $(CFLAGS) $(LDFLAGS) -g nethogs_testsum.cpp $(OBJS) -o nethogs_testsum -lpcap -lm $(LIBS) -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\" ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -g nethogs_testsum.cpp $(OBJS) -o nethogs_testsum -lpcap -lm $(LIBS) -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\" decpcap_test: decpcap_test.cpp decpcap.o - $(CXX) $(CFLAGS) decpcap_test.cpp decpcap.o -o decpcap_test -lpcap -lm -+ $(CXX) $(CFLAGS) $(LDFLAGS) decpcap_test.cpp decpcap.o -o decpcap_test -lpcap -lm ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) decpcap_test.cpp decpcap.o -o decpcap_test -lpcap -lm #-lefence + refresh.o: refresh.cpp refresh.h nethogs.h +- $(CXX) $(CFLAGS) -c refresh.cpp ++ $(CXX) $(CXXFLAGS) -c refresh.cpp + process.o: process.cpp process.h nethogs.h +- $(CXX) $(CFLAGS) -c process.cpp ++ $(CXX) $(CXXFLAGS) -c process.cpp + packet.o: packet.cpp packet.h nethogs.h +- $(CXX) $(CFLAGS) -c packet.cpp ++ $(CXX) $(CXXFLAGS) -c packet.cpp + connection.o: connection.cpp connection.h nethogs.h +- $(CXX) $(CFLAGS) -c connection.cpp ++ $(CXX) $(CXXFLAGS) -c connection.cpp + decpcap.o: decpcap.c decpcap.h +- $(CC) $(CFLAGS) -c decpcap.c ++ $(CC) $(CXXFLAGS) -c decpcap.c + inode2prog.o: inode2prog.cpp inode2prog.h nethogs.h +- $(CXX) $(CFLAGS) -c inode2prog.cpp ++ $(CXX) $(CXXFLAGS) -c inode2prog.cpp + conninode.o: conninode.cpp nethogs.h conninode.h +- $(CXX) $(CFLAGS) -c conninode.cpp ++ $(CXX) $(CXXFLAGS) -c conninode.cpp + #devices.o: devices.cpp devices.h +-# $(CXX) $(CFLAGS) -c devices.cpp ++# $(CXX) $(CXXFLAGS) -c devices.cpp + cui.o: cui.cpp cui.h nethogs.h +- $(CXX) $(CFLAGS) -c cui.cpp -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\" ++ $(CXX) $(CXXFLAGS) -c cui.cpp -DVERSION=\"$(VERSION)\" -DSUBVERSION=\"$(SUBVERSION)\" -DMINORVERSION=\"$(MINORVERSION)\" + + .PHONY: clean + clean:
