diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
commit | de49812990871e1705b64051c35161d5e6400269 (patch) | |
tree | 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /dev-util/cppcheck/files | |
parent | 536c3711867ec947c1738f2c4b96f22e4863322d (diff) |
gentoo resync : 24.12.2018
Diffstat (limited to 'dev-util/cppcheck/files')
3 files changed, 31 insertions, 95 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.84-char-signedness.patch b/dev-util/cppcheck/files/cppcheck-1.84-char-signedness.patch deleted file mode 100644 index ee1b136c9a9a..000000000000 --- a/dev-util/cppcheck/files/cppcheck-1.84-char-signedness.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 320a957bbc912325363cf86b61108db860195ec3 Mon Sep 17 00:00:00 2001 -From: Alexander Mai <amai@users.sf.net> -Date: Thu, 28 Jun 2018 22:16:18 +0200 -Subject: [PATCH] Extend TestSymbolDatabase::findFunction19 to outline - different results depending whether char is signed or unsigned on compile - time - ---- - test/testsymboldatabase.cpp | 28 ++++++++++++++++++++-------- - 1 file changed, 20 insertions(+), 8 deletions(-) - -diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp -index 0dafd2730..28473e8e9 100644 ---- a/test/testsymboldatabase.cpp -+++ b/test/testsymboldatabase.cpp -@@ -26,6 +26,7 @@ - #include "tokenlist.h" - #include "utils.h" - -+#include <climits> - #include <cstddef> - #include <list> - #include <map> -@@ -5065,6 +5066,7 @@ private: - " long get(long x) { return x; }\n" - " long long get(long long x) { return x; }\n" - " unsigned char get(unsigned char x) { return x; }\n" -+ " signed char get(signed char x) { return x; }\n" - " unsigned short get(unsigned short x) { return x; }\n" - " unsigned int get(unsigned int x) { return x; }\n" - " unsigned long get(unsigned long x) { return x; }\n" -@@ -5079,12 +5081,13 @@ private: - " long v5 = 1; v5 = get(get(v5));\n" - " long long v6 = 1; v6 = get(get(v6));\n" - " unsigned char v7 = '1'; v7 = get(get(v7));\n" -- " unsigned short v8 = 1; v8 = get(get(v8));\n" -- " unsigned int v9 = 1; v9 = get(get(v9));\n" -- " unsigned long v10 = 1; v10 = get(get(v10));\n" -- " unsigned long long v11 = 1; v11 = get(get(v11));\n" -- " E1 v12 = e1; v12 = get(get(v12));\n" -- " E2 v13 = E2::e2; v13 = get(get(v13));\n" -+ " signed char v8 = '1'; v8 = get(get(v8));\n" -+ " unsigned short v9 = 1; v9 = get(get(v9));\n" -+ " unsigned int v10 = 1; v10 = get(get(v10));\n" -+ " unsigned long v11 = 1; v11 = get(get(v11));\n" -+ " unsigned long long v12 = 1; v12 = get(get(v12));\n" -+ " E1 v13 = e1; v13 = get(get(v13));\n" -+ " E2 v14 = E2::e2; v14 = get(get(v14));\n" - " }\n" - "};"); - -@@ -5094,7 +5097,10 @@ private: - ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 4); - - f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v2 ) ) ;"); -- ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 5); -+ if (std::numeric_limits<char>::is_signed) -+ ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 5); -+ else -+ ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 10); - - f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v3 ) ) ;"); - ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 6); -@@ -5112,7 +5118,10 @@ private: - ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 10); - - f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v8 ) ) ;"); -- ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 11); -+ if (std::numeric_limits<char>::is_signed) -+ ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 5); -+ else -+ ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 10); - - f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v9 ) ) ;"); - ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 12); -@@ -5128,6 +5137,9 @@ private: - - f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v13 ) ) ;"); - ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 16); -+ -+ f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v14 ) ) ;"); -+ ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 17); - } - - void findFunction20() { // # 8280 --- -2.16.4 - 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"; |