Tue Jun 23 20:46:50 2020 UTC ()
cppcheck: update to 1.90nb2.

The tinyxml2 override (to use the pkgsrc version) stopped working.
Having both the pkgsrc version and the included copy used in
the build made cppcheck dump core.

Stop using the pkgsrc version since patching the build system to
avoid using the included copy is a lot of effort.


(wiz)
diff -r1.68 -r1.69 pkgsrc/devel/cppcheck/Makefile
cvs diff -r1.68 -r1.69 pkgsrc/devel/cppcheck/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/cppcheck/Makefile 2020/06/02 08:23:34 1.68
+++ pkgsrc/devel/cppcheck/Makefile 2020/06/23 20:46:50 1.69
@@ -1,55 +1,46 @@ @@ -1,55 +1,46 @@
1# $NetBSD: Makefile,v 1.68 2020/06/02 08:23:34 adam Exp $ 1# $NetBSD: Makefile,v 1.69 2020/06/23 20:46:50 wiz Exp $
2 2
3DISTNAME= cppcheck-1.90 3DISTNAME= cppcheck-1.90
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cppcheck/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cppcheck/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= reed@reedmedia.net 9MAINTAINER= reed@reedmedia.net
10HOMEPAGE= http://cppcheck.sourceforge.net/ 10HOMEPAGE= http://cppcheck.sourceforge.net/
11COMMENT= Tool for static C/C++ code analysis 11COMMENT= Tool for static C/C++ code analysis
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 14BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
15BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 15BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
16DEPENDS+= ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments 16DEPENDS+= ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
17 17
18USE_LANGUAGES= c c++0x 18USE_LANGUAGES= c c++0x
19USE_TOOLS+= gmake 19USE_TOOLS+= gmake
20 20
21BUILD_TARGET= all man 21BUILD_TARGET= all man
22BUILD_MAKE_FLAGS+= DB2MAN=${PREFIX}/share/xsl/docbook/manpages/docbook.xsl 22BUILD_MAKE_FLAGS+= DB2MAN=${PREFIX}/share/xsl/docbook/manpages/docbook.xsl
23# tell cppcheck where its CPP files are 23# tell cppcheck where its CPP files are
24MAKE_FLAGS+= FILESDIR=${PREFIX}/share/cppcheck 24MAKE_FLAGS+= FILESDIR=${PREFIX}/share/cppcheck
25# rules support (needs pcre) 25# rules support (needs pcre)
26MAKE_FLAGS+= HAVE_RULES=yes 26MAKE_FLAGS+= HAVE_RULES=yes
27 27
28# use pkgsrc tinyxml2 instead of included copy 
29MAKE_FLAGS+= TINYXML= 
30MAKE_FLAGS+= INCLUDE_FOR_LIB="-Ilib -isystem externals -isystem externals/simplecpp" 
31MAKE_FLAGS+= INCLUDE_FOR_CLI="-Ilib -isystem externals/simplecpp" 
32MAKE_FLAGS+= INCLUDE_FOR_TEST="-Ilib -Icli -isystem externals/simplecpp" 
33CPPFLAGS+= -I${BUILDLINK_PREFIX.tinyxml2}/include 
34LDFLAGS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.tinyxml2}/lib -L${BUILDLINK_PREFIX.tinyxml2}/lib -ltinyxml2 
35 
36.include "../../mk/compiler.mk" 28.include "../../mk/compiler.mk"
37.if !empty(CC_VERSION:Mgcc-4.[0-5]*) || !empty(CC_VERSION:Mgcc-3.*) 29.if !empty(CC_VERSION:Mgcc-4.[0-5]*) || !empty(CC_VERSION:Mgcc-3.*)
38CXXFLAGS+= -include lib/cxx11emu.h 30CXXFLAGS+= -include lib/cxx11emu.h
39.endif 31.endif
40 32
41INSTALLATION_DIRS+= ${PKGMANDIR}/man1 33INSTALLATION_DIRS+= ${PKGMANDIR}/man1
42 34
43REPLACE_PYTHON+= htmlreport/cppcheck-htmlreport 35REPLACE_PYTHON+= htmlreport/cppcheck-htmlreport
44 36
45.include "options.mk" 37.include "options.mk"
46 38
47.PHONY: man-install 39.PHONY: man-install
48post-install: man-install 40post-install: man-install
49man-install: 41man-install:
50 ${INSTALL_DATA} ${WRKSRC}/cppcheck.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 42 ${INSTALL_DATA} ${WRKSRC}/cppcheck.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
51 43
52.include "../../lang/python/application.mk" 44.include "../../lang/python/application.mk"
53.include "../../devel/pcre/buildlink3.mk" 45.include "../../devel/pcre/buildlink3.mk"
54.include "../../textproc/tinyxml2/buildlink3.mk" 
55.include "../../mk/bsd.pkg.mk" 46.include "../../mk/bsd.pkg.mk"