diff options
Diffstat (limited to 'dev-util/cppcheck/files')
| -rw-r--r-- | dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch | 14 | ||||
| -rw-r--r-- | dev-util/cppcheck/files/cppcheck-1.85-ldflags.patch | 24 |
2 files changed, 31 insertions, 7 deletions
diff --git a/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch index 9d8558466595..67e4ac65a410 100644 --- a/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch +++ b/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch @@ -1,15 +1,15 @@ ---- cppcheck-9999/gui/gui.pro -+++ cppcheck-9999/gui/gui.pro +--- a/gui/gui.pro ++++ b/gui/gui.pro @@ -19,6 +19,7 @@ DEFINES += CPPCHECKLIB_IMPORT } LIBS += -L$$PWD/../externals -+LIBS += `pkg-config --libs tinyxml2` ++LIBS += $(shell $(PKG_CONFIG) --libs tinyxml2) DESTDIR = . RCC_DIR = temp ---- cppcheck-9999/tools/dmake.cpp -+++ cppcheck-9999/tools/dmake.cpp +--- a/tools/dmake.cpp ++++ b/tools/dmake.cpp @@ -123,7 +123,6 @@ std::vector<std::string> extfiles; @@ -39,8 +39,8 @@ fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n"; fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n"; ---- cppcheck-9999/externals/externals.pri -+++ cppcheck-9999/externals/externals.pri +--- a/externals/externals.pri ++++ b/externals/externals.pri @@ -1,8 +1,5 @@ -INCLUDEPATH += $${PWD}/simplecpp \
- $${PWD}/tinyxml
diff --git a/dev-util/cppcheck/files/cppcheck-1.85-ldflags.patch b/dev-util/cppcheck/files/cppcheck-1.85-ldflags.patch new file mode 100644 index 000000000000..84e892827125 --- /dev/null +++ b/dev-util/cppcheck/files/cppcheck-1.85-ldflags.patch @@ -0,0 +1,24 @@ +--- a/tools/dmake.cpp ++++ b/tools/dmake.cpp +@@ -363,10 +363,10 @@ + fout << ".PHONY: run-dmake tags\n\n"; + fout << "\n###### Targets\n\n"; + fout << "cppcheck: $(LIBOBJ) $(CLIOBJ) $(EXTOBJ)\n"; +- fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n"; ++ fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(RDYNAMIC) $(LIBS)\n\n"; + fout << "all:\tcppcheck testrunner\n\n"; + fout << "testrunner: $(TESTOBJ) $(LIBOBJ) $(EXTOBJ) cli/threadexecutor.o cli/cmdlineparser.o cli/cppcheckexecutor.o cli/filelister.o\n"; +- fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n"; ++ fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(RDYNAMIC) $(LIBS)\n\n"; + fout << "test:\tall\n"; + fout << "\t./testrunner\n\n"; + fout << "check:\tall\n"; +@@ -380,7 +380,7 @@ + fout << "generate_cfg_tests: tools/generate_cfg_tests.o $(EXTOBJ)\n"; + fout << "\tg++ -Iexternals/tinyxml -o generate_cfg_tests tools/generate_cfg_tests.o $(EXTOBJ)\n"; + fout << "reduce:\ttools/reduce.o $(LIBOBJ) $(EXTOBJ)\n"; +- fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n"; ++ fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(RDYNAMIC) $(LIBS)\n\n"; + fout << "clean:\n"; + fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o externals/*/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n"; + fout << "man:\tman/cppcheck.1\n\n"; |