diff options
Diffstat (limited to 'dev-util/cppcheck/files')
-rw-r--r-- | dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch | 55 | ||||
-rw-r--r-- | dev-util/cppcheck/files/cppcheck-1.85-ldflags.patch | 24 | ||||
-rw-r--r-- | dev-util/cppcheck/files/cppcheck-9999-tinyxml2.patch | 56 |
3 files changed, 0 insertions, 135 deletions
diff --git a/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch deleted file mode 100644 index 67e4ac65a410..000000000000 --- a/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- a/gui/gui.pro -+++ b/gui/gui.pro -@@ -19,6 +19,7 @@ - DEFINES += CPPCHECKLIB_IMPORT - } - LIBS += -L$$PWD/../externals -+LIBS += $(shell $(PKG_CONFIG) --libs tinyxml2) - - DESTDIR = . - RCC_DIR = temp ---- a/tools/dmake.cpp -+++ b/tools/dmake.cpp -@@ -123,7 +123,6 @@ - - std::vector<std::string> extfiles; - extfiles.push_back("externals/simplecpp/simplecpp.cpp"); -- extfiles.push_back("externals/tinyxml/tinyxml2.cpp"); - - std::vector<std::string> clifiles; - getCppFiles(clifiles, "cli/", false); -@@ -172,7 +171,6 @@ - std::ofstream fout1("test/testfiles.pri"); - if (fout1.is_open()) { - fout1 << "# no manual edits - this file is autogenerated by dmake\n\n"; -- fout1 << "INCLUDEPATH += ../externals/tinyxml\n"; - fout1 << "\n\nSOURCES += "; - for (unsigned int i = 0; i < testfiles.size(); ++i) { - const std::string filename(testfiles[i].substr(5)); -@@ -337,9 +335,9 @@ - << "endif\n\n"; - - makeConditionalVariable(fout, "PREFIX", "/usr"); -- makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals/simplecpp -Iexternals/tinyxml"); -- makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals/simplecpp -Iexternals/tinyxml"); -- makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals/simplecpp -Iexternals/tinyxml"); -+ makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals/simplecpp"); -+ makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals/simplecpp"); -+ makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals/simplecpp"); - - fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n"; - fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n"; ---- a/externals/externals.pri -+++ b/externals/externals.pri -@@ -1,8 +1,5 @@ --INCLUDEPATH += $${PWD}/simplecpp \
-- $${PWD}/tinyxml
-+INCLUDEPATH += $${PWD}/simplecpp
-
--HEADERS += $${PWD}/simplecpp/simplecpp.h \
-- $${PWD}/tinyxml/tinyxml2.h
-+HEADERS += $${PWD}/simplecpp/simplecpp.h
-
--SOURCES += $${PWD}/simplecpp/simplecpp.cpp \
-- $${PWD}/tinyxml/tinyxml2.cpp
-+SOURCES += $${PWD}/simplecpp/simplecpp.cpp
diff --git a/dev-util/cppcheck/files/cppcheck-1.85-ldflags.patch b/dev-util/cppcheck/files/cppcheck-1.85-ldflags.patch deleted file mode 100644 index 84e892827125..000000000000 --- a/dev-util/cppcheck/files/cppcheck-1.85-ldflags.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- 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"; diff --git a/dev-util/cppcheck/files/cppcheck-9999-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-9999-tinyxml2.patch deleted file mode 100644 index 7a2a037ab377..000000000000 --- a/dev-util/cppcheck/files/cppcheck-9999-tinyxml2.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/externals/externals.pri -+++ b/externals/externals.pri -@@ -1,9 +1,6 @@ - INCLUDEPATH += $${PWD} \
-- $${PWD}/simplecpp \
-- $${PWD}/tinyxml
-+ $${PWD}/simplecpp
-
--HEADERS += $${PWD}/simplecpp/simplecpp.h \
-- $${PWD}/tinyxml/tinyxml2.h
-+HEADERS += $${PWD}/simplecpp/simplecpp.h
-
--SOURCES += $${PWD}/simplecpp/simplecpp.cpp \
-- $${PWD}/tinyxml/tinyxml2.cpp
-+SOURCES += $${PWD}/simplecpp/simplecpp.cpp
---- a/gui/gui.pro -+++ b/gui/gui.pro -@@ -15,6 +15,7 @@ contains(LINKCORE, [yY][eE][sS]) { - DEFINES += CPPCHECKLIB_IMPORT - } - LIBS += -L$$PWD/../externals -+LIBS += $(shell $(PKG_CONFIG) --libs tinyxml2) - - DESTDIR = . - RCC_DIR = temp ---- a/tools/dmake.cpp -+++ b/tools/dmake.cpp -@@ -122,7 +122,6 @@ int main(int argc, char **argv) - - std::vector<std::string> extfiles; - extfiles.push_back("externals/simplecpp/simplecpp.cpp"); -- extfiles.push_back("externals/tinyxml/tinyxml2.cpp"); - - std::vector<std::string> clifiles; - getCppFiles(clifiles, "cli/", false); -@@ -171,7 +170,6 @@ int main(int argc, char **argv) - std::ofstream fout1("test/testfiles.pri"); - if (fout1.is_open()) { - fout1 << "# no manual edits - this file is autogenerated by dmake\n\n"; -- fout1 << "INCLUDEPATH += ../externals/tinyxml\n"; - fout1 << "\n\nSOURCES += "; - for (unsigned int i = 0; i < testfiles.size(); ++i) { - const std::string filename(testfiles[i].substr(5)); -@@ -335,9 +333,9 @@ int main(int argc, char **argv) - << "endif\n\n"; - - makeConditionalVariable(fout, "PREFIX", "/usr"); -- makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -isystem externals -isystem externals/simplecpp -isystem externals/tinyxml"); -- makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -isystem externals/simplecpp -isystem externals/tinyxml"); -- makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -isystem externals/simplecpp -isystem externals/tinyxml"); -+ makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -isystem externals -isystem externals/simplecpp"); -+ makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -isystem externals/simplecpp"); -+ makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -isystem externals/simplecpp"); - - fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n"; - fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n"; |