From 21f316252605af6c72e5e0dec40923cab974448b Mon Sep 17 00:00:00 2001 From: David Seifert Date: Mon, 22 Nov 2021 16:52:04 +0100 Subject: dev-util/cppcheck: drop 1.88, 2.2 Signed-off-by: David Seifert --- .../cppcheck/files/cppcheck-1.88-tinyxml2.patch | 101 --------------------- 1 file changed, 101 deletions(-) delete mode 100644 dev-util/cppcheck/files/cppcheck-1.88-tinyxml2.patch (limited to 'dev-util/cppcheck/files/cppcheck-1.88-tinyxml2.patch') diff --git a/dev-util/cppcheck/files/cppcheck-1.88-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.88-tinyxml2.patch deleted file mode 100644 index 0ad79ebf4d0d..000000000000 --- a/dev-util/cppcheck/files/cppcheck-1.88-tinyxml2.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff --git a/gui/gui.pro b/gui/gui.pro -index 0cbaebf..cb381dd 100644 ---- 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 -diff --git a/tools/dmake.cpp b/tools/dmake.cpp -index 298cb98..c3afd26 100644 ---- a/tools/dmake.cpp -+++ b/tools/dmake.cpp -@@ -122,7 +122,6 @@ int main(int argc, char **argv) - - std::vector extfiles; - extfiles.push_back("externals/simplecpp/simplecpp.cpp"); -- extfiles.push_back("externals/tinyxml/tinyxml2.cpp"); - - std::vector 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)); -@@ -341,9 +339,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"; -diff --git a/oss-fuzz/Makefile b/oss-fuzz/Makefile -index 81cf654..26f9da9 100644 ---- a/oss-fuzz/Makefile -+++ b/oss-fuzz/Makefile -@@ -6,8 +6,8 @@ - # make CXX=clang++-6.0 CXXFLAGS="-fsanitize=address" fuzz-client - - CPPCHECK_DIR=.. --INCLUDE_DIR=-I ${CPPCHECK_DIR}/lib -I ${CPPCHECK_DIR}/externals/simplecpp -I ${CPPCHECK_DIR}/externals/tinyxml -I ${CPPCHECK_DIR}/externals --SRC_FILES=main.cpp type2.cpp ${CPPCHECK_DIR}/externals/simplecpp/simplecpp.cpp ${CPPCHECK_DIR}/externals/tinyxml/tinyxml2.cpp ${CPPCHECK_DIR}/lib/*.cpp -+INCLUDE_DIR=-I ${CPPCHECK_DIR}/lib -I ${CPPCHECK_DIR}/externals/simplecpp -I ${CPPCHECK_DIR}/externals -+SRC_FILES=main.cpp type2.cpp ${CPPCHECK_DIR}/externals/simplecpp/simplecpp.cpp ${CPPCHECK_DIR}/lib/*.cpp - - all: oss-fuzz-client translate - -diff --git a/Makefile b/Makefile -index 372647e..9d65717 100644 ---- a/Makefile -+++ b/Makefile -@@ -179,8 +179,7 @@ LIBOBJ = $(libcppdir)/analyzerinfo.o \ - $(libcppdir)/tokenlist.o \ - $(libcppdir)/valueflow.o - --EXTOBJ = externals/simplecpp/simplecpp.o \ -- externals/tinyxml/tinyxml2.o -+EXTOBJ = externals/simplecpp/simplecpp.o - - CLIOBJ = cli/cmdlineparser.o \ - cli/cppcheckexecutor.o \ -@@ -689,9 +688,6 @@ test/testvarid.o: test/testvarid.cpp lib/platform.h lib/config.h lib/settings.h - externals/simplecpp/simplecpp.o: externals/simplecpp/simplecpp.cpp externals/simplecpp/simplecpp.h - $(CXX) $(CPPFLAGS) $(CFG) $(CXXFLAGS) -w $(UNDEF_STRICT_ANSI) -c -o externals/simplecpp/simplecpp.o externals/simplecpp/simplecpp.cpp - --externals/tinyxml/tinyxml2.o: externals/tinyxml/tinyxml2.cpp externals/tinyxml/tinyxml2.h -- $(CXX) $(CPPFLAGS) $(CFG) $(CXXFLAGS) -w $(UNDEF_STRICT_ANSI) -c -o externals/tinyxml/tinyxml2.o externals/tinyxml/tinyxml2.cpp -- - tools/clang-ast.o: tools/clang-ast.cpp - $(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CFG) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o tools/clang-ast.o tools/clang-ast.cpp - -diff --git a/externals/externals.pri b/externals/externals.pri -index 7f0be8d..b1e94e0 100644 ---- 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 -- cgit v1.2.3-65-gdbad