diff options
Diffstat (limited to 'dev-util/cppcheck')
-rw-r--r-- | dev-util/cppcheck/Manifest | 5 | ||||
-rw-r--r-- | dev-util/cppcheck/cppcheck-1.87.ebuild | 2 | ||||
-rw-r--r-- | dev-util/cppcheck/cppcheck-9999.ebuild | 4 | ||||
-rw-r--r-- | dev-util/cppcheck/files/cppcheck-9999-tinyxml2.patch | 56 |
4 files changed, 62 insertions, 5 deletions
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest index aa0bb3d81240..8760ce3325b1 100644 --- a/dev-util/cppcheck/Manifest +++ b/dev-util/cppcheck/Manifest @@ -1,8 +1,9 @@ AUX cppcheck-1.75-tinyxml2.patch 2232 BLAKE2B 389e8678fca9eee616640fc535b0c71d0476f6a2a3eb8700238d85bbc32823c92fe9b72e1a4a3b01143e23df60996a21a669625b418e579441d85ef460fd38b5 SHA512 575dfe090885cbd8157b089def7a47750519b8ea459404d3755ce23ea98e0fde2da5f0c7551a69ac195c2e3c5d03ce5a71c3d66b3fb119609eba6aaa31c39899 AUX cppcheck-1.85-ldflags.patch 1503 BLAKE2B 0458ff66d61b9cd759839d31bc0fbe611e7d23e8d720a4b0a861d53b3fc54b30d67c481c22dfbb5254a6160eac04505f00dee01c4283214e15e21b26e0b7a76c SHA512 7cad7d456c8d3bfa5efab1c67bcd0f7e509e10e539ee9941055caad41ff3b4737d3ff82cfa172ad867651817bdd4a518a98d22732ce0df5227c149dd2122e9f7 +AUX cppcheck-9999-tinyxml2.patch 2491 BLAKE2B df8130302d06dde1c7f21cb4aa49daf0b1cb7e39593a6e8a08716feb44e8c34cf453c4ff4eb68a8e5cdf088ee8556d54cf1d351f4732ebdc0799579e80579986 SHA512 a8ff7854bffbb7e578cf6f0ccefd66ab02b7f3dd707540d2de140054440efd45528b5aea57e8ac7dffd7f7e44e48df04a48bd2693d5345fa39ccb23b08bc10b2 DIST cppcheck-1.86.tar.gz 2184186 BLAKE2B 8b488ec72d0998d6b037de2b1204373c8b3de475ad165bf108bb331399356cb0d1e20a7bc6f368f1a038ec886ad7a84ad694172d0a96a203a6877f3838c21001 SHA512 59cec55b8408e8f2e2e7172bce69350c248bc3185a0938b523c44a58f98b344e11aef957ec1b7a7b2bc7a876660b2683e51f54b76f0b550f9549497c29453655 DIST cppcheck-1.87.tar.gz 2243258 BLAKE2B ffe42bfb2e896163678c5bb24e46ae2391ba8254cbe7c1c19c3c1b16cd38adf9c773de6aaefe70af08b9c1dca8b0b0b5e9939323368a2f81491fd6981ff18139 SHA512 b0149002b40260c1488904929296403722a66b84263b41d0097c3caed28265332766c114f0d1f378ea6c7e73ab973ea71ab89c6744f6cc818f22de08933e6766 EBUILD cppcheck-1.86.ebuild 2314 BLAKE2B de0698614f2f1790971fe198662fd235e5456a1f9a046f10d628889517bc5809fac6c76222ca7a5b0d7909c7842d77244c81c9606812450118e61c476492f08b SHA512 8d8502abb416704964aacb1267c2814e5cf50fe02c4a245bbb217a4cadbffa6efc1f288a94143b36f739d6f89e5f75133b1aa691565c76ac92a49cb0984d0c1e -EBUILD cppcheck-1.87.ebuild 2324 BLAKE2B 215dfedc15175569b7ee7b74d7e777340c04f0f464b1231ec2d5972d6872f699795f533e569ac4d2e1ea7db1924368cd69c27a3ba02a6905763dec30723b7ca1 SHA512 0ab1c75db54314f4406c70ceca3e4fddb298477eb242f17e765add78ba1be95eb2fe7b4aa3ab394ebddd2c3a054299d1c1b0ab67d7aff2c6107ba6c9c19a31d5 -EBUILD cppcheck-9999.ebuild 2218 BLAKE2B 8da9a6043ccca21b3ff5c3cfc7c1a01921a74f5d90a85245f02c5b9892c310ceaafa33c7d3b788582cbd89a45954ab6c62936740093807b5cc6dc69a666a6189 SHA512 f135588fd803a510c43a3c1d37e018bcab6ab2daf03a04ce32f2d7285b421e4ea859c07f335974b0e234660fb0df309ba0a8ed41d46704ca8363b2674de69923 +EBUILD cppcheck-1.87.ebuild 2328 BLAKE2B 0472eb40d75e394e37b3ce4d5089978619164875bd5fb722c0d622f2a0891520de4102b2a5f8c020f8b3dd8b3f571b4b1c5ea088cfffef6bf96d1a8d260fc329 SHA512 7f0672ae4560ae3bc9abaa575dbfa0e0835f3e2081ba4b3f80f9e8b0e8faf59a97ded20c68e68def32e9807d0eeb805945260e3a5d7120fe31857b4f5eb877bd +EBUILD cppcheck-9999.ebuild 2222 BLAKE2B abd4fb4a91ac18e5e3c7280e1d180039f2a251bcf63d3e436fea917e79343cb84034eae35e42ec101f5fca91dd8a1334141991afd4d0c0a1ad66da30b6511d77 SHA512 fc2c2565d1979f5cd43222a22fd1df2c8d9eebfe8906acb0092d3ee6ddbc54d221651e156c35fa791a0cab8146e84cbfc6daa8d51df384f6a59c647244c15490 MISC metadata.xml 401 BLAKE2B b48cd9d365773e4c050d1ce2f58a108fa33bf28fb669a8fbe99a9b15d33cf203fa4a94d3411674892efb4cb5e5bd1cb5a08d97a3054b7fbdacc462695f0d1874 SHA512 08b51c30fcc21277bf320c1c9f36cd9efc7c39261b52f70f686953731c2d075482fc1959457dbe276877d508510b32a23d8f7def4ca52044fabc44a23c56a8f4 diff --git a/dev-util/cppcheck/cppcheck-1.87.ebuild b/dev-util/cppcheck/cppcheck-1.87.ebuild index 13f0eb6f1f86..7630b01b69e4 100644 --- a/dev-util/cppcheck/cppcheck-1.87.ebuild +++ b/dev-util/cppcheck/cppcheck-1.87.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) inherit distutils-r1 qmake-utils toolchain-funcs DESCRIPTION="Static analyzer of C/C++ code" diff --git a/dev-util/cppcheck/cppcheck-9999.ebuild b/dev-util/cppcheck/cppcheck-9999.ebuild index 4eb9053d4312..0bcf6e7db8d0 100644 --- a/dev-util/cppcheck/cppcheck-9999.ebuild +++ b/dev-util/cppcheck/cppcheck-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) inherit distutils-r1 git-r3 qmake-utils toolchain-funcs DESCRIPTION="Static analyzer of C/C++ code" @@ -30,7 +30,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig " PATCHES=( - "${FILESDIR}"/${PN}-1.75-tinyxml2.patch + "${FILESDIR}"/${PN}-9999-tinyxml2.patch ) src_prepare() { diff --git a/dev-util/cppcheck/files/cppcheck-9999-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-9999-tinyxml2.patch new file mode 100644 index 000000000000..7a2a037ab377 --- /dev/null +++ b/dev-util/cppcheck/files/cppcheck-9999-tinyxml2.patch @@ -0,0 +1,56 @@ +--- 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"; |