[gentoo-commits] gentoo-x86 commit in dev-util/cppcheck/files: cppcheck-1.65-tinyxml2.patch cppcheck-1.65-c++0x.patch

[Michael Weber (xmw)]

xmw         14/05/19 15:50:30

  Added:                cppcheck-1.65-tinyxml2.patch
                        cppcheck-1.65-c++0x.patch
  Log:
  Version bump, update HOMEPAGE
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
62EEF090)

Revision  Changes    Path
1.1                  dev-util/cppcheck/files/cppcheck-1.65-tinyxml2.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppcheck/files/cppcheck-1.65-tinyxml2.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppcheck/files/cppcheck-1.65-tinyxml2.patch?rev=1.1&content-type=text/plain

Index: cppcheck-1.65-tinyxml2.patch
===================================================================
--- cppcheck-1.65/Makefile
+++ cppcheck-1.65/Makefile
@@ -94,15 +94,15 @@
 endif
 
 ifndef INCLUDE_FOR_LIB
-    INCLUDE_FOR_LIB=-Ilib -Iexternals/tinyxml
+    INCLUDE_FOR_LIB=-Ilib
 endif
 
 ifndef INCLUDE_FOR_CLI
-    INCLUDE_FOR_CLI=-Ilib -Iexternals/tinyxml
+    INCLUDE_FOR_CLI=-Ilib
 endif
 
 ifndef INCLUDE_FOR_TEST
-    INCLUDE_FOR_TEST=-Ilib -Icli -Iexternals/tinyxml
+    INCLUDE_FOR_TEST=-Ilib -Icli
 endif
 
 BIN=$(DESTDIR)$(PREFIX)/bin
@@ -242,11 +242,11 @@
        $(CXX) $(CXXFLAGS) -std=c++0x -o dmake tools/dmake.o cli/filelister.o 
lib/path.o -Ilib $(LDFLAGS)
        ./dmake
 
-reduce:        tools/reduce.o externals/tinyxml/tinyxml2.o $(LIBOBJ)
-       $(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -g -o reduce tools/reduce.o 
-Ilib -Iexternals/tinyxml $(LIBOBJ) $(LIBS) externals/tinyxml/tinyxml2.o 
$(LDFLAGS) $(RDYNAMIC)
+reduce:        tools/reduce.o $(LIBOBJ)
+       $(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -g -o reduce tools/reduce.o 
-Ilib $(LIBOBJ) $(LIBS) $(LDFLAGS) $(RDYNAMIC)
 
 clean:
-       rm -f build/*.o lib/*.o cli/*.o test/*.o externals/tinyxml/*.o 
testrunner reduce dmake cppcheck cppcheck.1
+       rm -f build/*.o lib/*.o cli/*.o test/*.o testrunner reduce dmake 
cppcheck cppcheck.1
 
 man:   man/cppcheck.1
 



1.1                  dev-util/cppcheck/files/cppcheck-1.65-c++0x.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppcheck/files/cppcheck-1.65-c++0x.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppcheck/files/cppcheck-1.65-c++0x.patch?rev=1.1&content-type=text/plain

Index: cppcheck-1.65-c++0x.patch
===================================================================
--- cppcheck-1.65/gui/gui.pro
+++ cppcheck-1.65/gui/gui.pro
@@ -150,6 +150,4 @@
     LIBS += -lshlwapi
 }
 
-contains(QMAKE_CC, gcc) {
     QMAKE_CXXFLAGS += -std=c++0x
-}