pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

lcov-git: fix some problems

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Wed Jul 15 18:33:15 2026 +0200
Changeset:	9e6b9bd47dad37fe82f56d0581f6a421208a943c

Modified Files:
	lcov-git/Makefile
	lcov-git/PLIST
Added Files:
	lcov-git/distinfo
	lcov-git/patches/patch-Makefile

Log Message:
lcov-git: fix some problems

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9e6b9bd47dad37fe82f56d0581f6a421208a943c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 lcov-git/Makefile               |  29 +++++-
 lcov-git/PLIST                  | 218 +++++++++++++++++++++++++++++++++++++++-
 lcov-git/distinfo               |   3 +
 lcov-git/patches/patch-Makefile |  18 ++++
 4 files changed, 264 insertions(+), 4 deletions(-)

diffs:
diff --git a/lcov-git/Makefile b/lcov-git/Makefile
index f20eb391b3..617403b4d0 100644
--- a/lcov-git/Makefile
+++ b/lcov-git/Makefile
@@ -20,6 +20,9 @@ DEPENDS+=	p5-DateTime-[0-9]*:../../time/p5-DateTime
 
 USE_TOOLS+=	bash:run gmake perl
 
+# c, but c++ for testing
+USE_LANGUAGES=	c c++
+
 BUILD_TARGET=	doc_finished
 
 MAKE_FLAGS+=	PREFIX=${PREFIX}
@@ -27,19 +30,26 @@ MAKE_FLAGS+=	DESTDIR=${DESTDIR}
 MAKE_FLAGS+=	SPHINXBUILD=${PREFIX}/bin/sphinx-build-${PYVERSSUFFIX}
 MAKE_FLAGS+=	MAN_DIR=${PREFIX}/${PKGMANDIR}
 MAKE_FLAGS+=	CFG_INST_DIR=${DESTDIR}${PREFIX}/share/examples/lcov
+MAKE_FLAGS+=	SHELL=bash
 
 CONF_FILES=	${PREFIX}/share/examples/lcov/lcovrc \
 		${PKG_SYSCONFDIR}/lcovrc
 
 REPLACE_BASH+=	bin/checkstyle.sh
 REPLACE_BASH+=	bin/copy_dates.sh
+REPLACE_BASH+=	bin/get_changes.sh
+REPLACE_BASH+=	bin/get_version.sh
+REPLACE_BASH+=	tests/*/*.sh
+REPLACE_BASH+=	tests/*/*/*.sh
+REPLACE_BASH+=	tests/bin/test_run
+REPLACE_BASH+=	tests/bin/test_skip
+REPLACE_BASH+=	tests/bin/testsuite_exit
+REPLACE_BASH+=	tests/bin/testsuite_init
 REPLACE_PERL+=	bin/fix.pl
 REPLACE_PERL+=	bin/gendesc
 REPLACE_PERL+=	bin/genhtml
 REPLACE_PERL+=	bin/geninfo
 REPLACE_PERL+=	bin/genpng
-REPLACE_BASH+=	bin/get_changes.sh
-REPLACE_BASH+=	bin/get_version.sh
 REPLACE_PERL+=	bin/lcov
 REPLACE_PERL+=	bin/llvm2lcov
 REPLACE_PERL+=	bin/perl2lcov
@@ -53,14 +63,27 @@ REPLACE_PERL+=	scripts/gitdiff
 REPLACE_PERL+=	scripts/gitversion
 REPLACE_PERL+=	scripts/p4annotate
 REPLACE_PERL+=	scripts/p4udiff
+REPLACE_PERL+=	tests/bin/check_counts
+REPLACE_PERL+=	tests/bin/checkdeps
+REPLACE_PERL+=	tests/bin/mkinfo
+REPLACE_PERL+=	tests/genhtml/filter/filter.pl
+# should be *.pl
+# https://github.com/linux-test-project/lcov/issues/496
+REPLACE_PERL+=	tests/genhtml/insensitive/annotate.sh
+REPLACE_PERL+=	tests/genhtml/insensitive/version.sh
+REPLACE_PERL+=	tests/genhtml/simple/annotate.sh
+REPLACE_PERL+=	tests/lcov/demangle/simplify.pl
 
 REPLACE_PYTHON+=	bin/py2lcov
 REPLACE_PYTHON+=	bin/xml2lcov
 REPLACE_PYTHON+=	bin/xml2lcovutil.py
 REPLACE_PYTHON+=	scripts/*.py
+REPLACE_PYTHON+=	tests/bin/cleantests.py
+REPLACE_PYTHON+=	tests/bin/common.py
+REPLACE_PYTHON+=	tests/bin/runtests.py
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/tool.mk"
 .include "../../lang/python/pyversion.mk"
+.include "../../lang/python/tool.mk"
 .include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lcov-git/PLIST b/lcov-git/PLIST
index 6d84b17e30..94197e47eb 100644
--- a/lcov-git/PLIST
+++ b/lcov-git/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2026/07/06 18:24:29 wiz Exp $
+@comment $NetBSD$
 bin/gendesc
 bin/genhtml
 bin/geninfo
@@ -21,6 +21,16 @@ man/man1/py2lcov.1
 man/man1/spreadsheet.py.1
 man/man5/lcovrc.5
 share/examples/lcov/lcovrc
+share/lcov/example/Makefile
+share/lcov/example/README.rst
+share/lcov/example/descriptions.txt
+share/lcov/example/example.c
+share/lcov/example/example_mod.c
+share/lcov/example/gauss.h
+share/lcov/example/iterate.h
+share/lcov/example/methods/gauss.c
+share/lcov/example/methods/iterate.c
+share/lcov/example/methods/iterate_mod.c
 share/lcov/html/.buildinfo
 share/lcov/html/_sources/index.rst.txt
 share/lcov/html/_sources/man/gendesc.rst.txt
@@ -133,3 +143,209 @@ share/lcov/support-scripts/simplify.pm
 share/lcov/support-scripts/spreadsheet.py
 share/lcov/support-scripts/threshold.pm
 share/lcov/support-scripts/unreach.pm
+share/lcov/tests/Makefile
+share/lcov/tests/README.md
+share/lcov/tests/bin/check_counts
+share/lcov/tests/bin/checkdeps
+share/lcov/tests/bin/cleantests.py
+share/lcov/tests/bin/common
+share/lcov/tests/bin/common.py
+share/lcov/tests/bin/mkinfo
+share/lcov/tests/bin/runtests.py
+share/lcov/tests/bin/test_run
+share/lcov/tests/bin/test_skip
+share/lcov/tests/bin/test_worker.py
+share/lcov/tests/bin/testsuite_exit
+share/lcov/tests/bin/testsuite_init
+share/lcov/tests/common.mak
+share/lcov/tests/common.tst
+share/lcov/tests/genhtml/Makefile
+share/lcov/tests/genhtml/demangle.sh
+share/lcov/tests/genhtml/errs/Makefile
+share/lcov/tests/genhtml/errs/MsgContext.pm
+share/lcov/tests/genhtml/errs/genError.pm
+share/lcov/tests/genhtml/errs/mcdc_errs.dat
+share/lcov/tests/genhtml/errs/missingRestore.pm
+share/lcov/tests/genhtml/errs/msgtest.sh
+share/lcov/tests/genhtml/errs/parallelFail.pm
+share/lcov/tests/genhtml/errs/select.sh
+share/lcov/tests/genhtml/exception/Makefile
+share/lcov/tests/genhtml/exception/exception.cpp
+share/lcov/tests/genhtml/exception/exception.sh
+share/lcov/tests/genhtml/filter/Makefile
+share/lcov/tests/genhtml/filter/brace.c
+share/lcov/tests/genhtml/filter/brace.info
+share/lcov/tests/genhtml/filter/expr1.c
+share/lcov/tests/genhtml/filter/expr2.c
+share/lcov/tests/genhtml/filter/expr3.c
+share/lcov/tests/genhtml/filter/expr4.c
+share/lcov/tests/genhtml/filter/filter.pl
+share/lcov/tests/genhtml/filter/multilineTrivial.c
+share/lcov/tests/genhtml/filter/multilineTrivial2.c
+share/lcov/tests/genhtml/filter/notTrivial1.c
+share/lcov/tests/genhtml/filter/notTrivial2.c
+share/lcov/tests/genhtml/filter/notTrivial3.c
+share/lcov/tests/genhtml/filter/notTrivial_init.c
+share/lcov/tests/genhtml/filter/notTrivial_multiline.c
+share/lcov/tests/genhtml/filter/trivial1.c
+share/lcov/tests/genhtml/filter/trivial2.c
+share/lcov/tests/genhtml/filter/trivial3.c
+share/lcov/tests/genhtml/filter/trivialMethod.c
+share/lcov/tests/genhtml/full.sh
+share/lcov/tests/genhtml/function/Makefile
+share/lcov/tests/genhtml/function/baseline_call_current_call.gold
+share/lcov/tests/genhtml/function/baseline_call_current_call_region.gold
+share/lcov/tests/genhtml/function/baseline_call_current_nocall.gold
+share/lcov/tests/genhtml/function/baseline_call_current_nocall_region.gold
+share/lcov/tests/genhtml/function/baseline_nocall_current_call.gold
+share/lcov/tests/genhtml/function/baseline_nocall_current_call_region.gold
+share/lcov/tests/genhtml/function/baseline_nocall_current_nocall.gold
+share/lcov/tests/genhtml/function/baseline_nocall_current_nocall_region.gold
+share/lcov/tests/genhtml/function/current.cpp
+share/lcov/tests/genhtml/function/function.sh
+share/lcov/tests/genhtml/function/initial.cpp
+share/lcov/tests/genhtml/function/template.cpp
+share/lcov/tests/genhtml/insensitive/Makefile
+share/lcov/tests/genhtml/insensitive/annotate.sh
+share/lcov/tests/genhtml/insensitive/insensitive.sh
+share/lcov/tests/genhtml/insensitive/version.sh
+share/lcov/tests/genhtml/lambda/Makefile
+share/lcov/tests/genhtml/lambda/lambda.cpp
+share/lcov/tests/genhtml/lambda/lambda.sh
+share/lcov/tests/genhtml/mycppfilt.sh
+share/lcov/tests/genhtml/part1.sh
+share/lcov/tests/genhtml/part2.sh
+share/lcov/tests/genhtml/relative/Makefile
+share/lcov/tests/genhtml/relative/relative.info
+share/lcov/tests/genhtml/relative/relative.sh
+share/lcov/tests/genhtml/simple/Makefile
+share/lcov/tests/genhtml/simple/annotate.sh
+share/lcov/tests/genhtml/simple/script.sh
+share/lcov/tests/genhtml/simple/simple.cpp
+share/lcov/tests/genhtml/simple/simple2.cpp
+share/lcov/tests/genhtml/simple/simple2.cpp.annotated
+share/lcov/tests/genhtml/simple/unreach.cpp
+share/lcov/tests/genhtml/synthesize/Makefile
+share/lcov/tests/genhtml/synthesize/munge.pl
+share/lcov/tests/genhtml/synthesize/munge2.pl
+share/lcov/tests/genhtml/synthesize/synthesize.sh
+share/lcov/tests/genhtml/target.sh
+share/lcov/tests/genhtml/zero.sh
+share/lcov/tests/lcov/Makefile
+share/lcov/tests/lcov/add/Makefile
+share/lcov/tests/lcov/add/prune.sh
+share/lcov/tests/lcov/add/track.sh
+share/lcov/tests/lcov/branch/Makefile
+share/lcov/tests/lcov/branch/branch.cpp
+share/lcov/tests/lcov/branch/branch.sh
+share/lcov/tests/lcov/branch/bug.dat
+share/lcov/tests/lcov/coverage/Makefile
+share/lcov/tests/lcov/coverage/coverage.sh
+share/lcov/tests/lcov/coverage/geninfo.sh
+share/lcov/tests/lcov/demangle/Makefile
+share/lcov/tests/lcov/demangle/demangle.cpp
+share/lcov/tests/lcov/demangle/demangle.sh
+share/lcov/tests/lcov/demangle/simplify.cmd
+share/lcov/tests/lcov/demangle/simplify.pl
+share/lcov/tests/lcov/errs/Makefile
+share/lcov/tests/lcov/errs/badBranchLine.info
+share/lcov/tests/lcov/errs/badFncEndLine.info
+share/lcov/tests/lcov/errs/badFncLine.info
+share/lcov/tests/lcov/errs/badLine.info
+share/lcov/tests/lcov/errs/branchNoLine.info
+share/lcov/tests/lcov/errs/emptyFileRecord.info
+share/lcov/tests/lcov/errs/errs.sh
+share/lcov/tests/lcov/errs/exceptionBranch1.info
+share/lcov/tests/lcov/errs/exceptionBranch2.info
+share/lcov/tests/lcov/errs/fncMismatch.info
+share/lcov/tests/lcov/errs/funcNoLine.info
+share/lcov/tests/lcov/errs/lineNoBranch.info
+share/lcov/tests/lcov/errs/lineNoFunc.info
+share/lcov/tests/lcov/errs/noFunc.info
+share/lcov/tests/lcov/exception/Makefile
+share/lcov/tests/lcov/exception/example.data
+share/lcov/tests/lcov/exception/exception.cpp
+share/lcov/tests/lcov/exception/exception.sh
+share/lcov/tests/lcov/extract/Makefile
+share/lcov/tests/lcov/extract/brokenCallback.pm
+share/lcov/tests/lcov/extract/envErr.rc
+share/lcov/tests/lcov/extract/envVar.rc
+share/lcov/tests/lcov/extract/extract.cpp
+share/lcov/tests/lcov/extract/extract.sh
+share/lcov/tests/lcov/extract/fakeResolve.sh
+share/lcov/tests/lcov/extract/history.sh
+share/lcov/tests/lcov/extract/list.gold
+share/lcov/tests/lcov/extract/list_mcdc.gold
+share/lcov/tests/lcov/extract/testContext.sh
+share/lcov/tests/lcov/extract/unused.c
+share/lcov/tests/lcov/follow/Makefile
+share/lcov/tests/lcov/follow/follow.sh
+share/lcov/tests/lcov/format/Makefile
+share/lcov/tests/lcov/format/format.info
+share/lcov/tests/lcov/format/format.sh
+share/lcov/tests/lcov/gcov-tool/Makefile
+share/lcov/tests/lcov/gcov-tool/mygcov.sh
+share/lcov/tests/lcov/gcov-tool/path.sh
+share/lcov/tests/lcov/gcov-tool/test.c
+share/lcov/tests/lcov/initializer/Makefile
+share/lcov/tests/lcov/initializer/initializer.cpp
+share/lcov/tests/lcov/initializer/initializer.sh
+share/lcov/tests/lcov/lambda/Makefile
+share/lcov/tests/lcov/lambda/lambda.dat
+share/lcov/tests/lcov/lambda/lambda.sh
+share/lcov/tests/lcov/lambda/lambda2.dat
+share/lcov/tests/lcov/mcdc/Makefile
+share/lcov/tests/lcov/mcdc/main.cpp
+share/lcov/tests/lcov/mcdc/mcdc.sh
+share/lcov/tests/lcov/mcdc/test.cpp
+share/lcov/tests/lcov/merge/Makefile
+share/lcov/tests/lcov/merge/a.dat
+share/lcov/tests/lcov/merge/a.info
+share/lcov/tests/lcov/merge/a_subtract_b.gold
+share/lcov/tests/lcov/merge/b.dat
+share/lcov/tests/lcov/merge/b.info
+share/lcov/tests/lcov/merge/b_subtract_a.gold
+share/lcov/tests/lcov/merge/functionBug_1.dat
+share/lcov/tests/lcov/merge/functionBug_2.dat
+share/lcov/tests/lcov/merge/intersect.gold
+share/lcov/tests/lcov/merge/mcdc.dat
+share/lcov/tests/lcov/merge/merge.sh
+share/lcov/tests/lcov/misc/Makefile
+share/lcov/tests/lcov/misc/help.sh
+share/lcov/tests/lcov/misc/version.sh
+share/lcov/tests/lcov/multiple/Makefile
+share/lcov/tests/lcov/multiple/multiple.sh
+share/lcov/tests/lcov/summary/Makefile
+share/lcov/tests/lcov/summary/concatenated.sh
+share/lcov/tests/lcov/summary/concatenated2.sh
+share/lcov/tests/lcov/summary/full.sh
+share/lcov/tests/lcov/summary/part1.sh
+share/lcov/tests/lcov/summary/part2.sh
+share/lcov/tests/lcov/summary/target.sh
+share/lcov/tests/lcov/summary/zero.sh
+share/lcov/tests/lcovrc
+share/lcov/tests/llvm2lcov/Makefile
+share/lcov/tests/llvm2lcov/llvm2lcov.sh
+share/lcov/tests/llvm2lcov/main.cpp
+share/lcov/tests/llvm2lcov/test.h
+share/lcov/tests/perl2lcov/Makefile
+share/lcov/tests/perl2lcov/example.pl
+share/lcov/tests/perl2lcov/perltest1.sh
+share/lcov/tests/profiles/large
+share/lcov/tests/profiles/medium
+share/lcov/tests/profiles/small
+share/lcov/tests/py2lcov/Makefile
+share/lcov/tests/py2lcov/localmodule.py
+share/lcov/tests/py2lcov/py2lcov.sh
+share/lcov/tests/py2lcov/test.py
+share/lcov/tests/scripts/Makefile
+share/lcov/tests/scripts/batchgitversion_test.sh
+share/lcov/tests/scripts/gitblame_test.sh
+share/lcov/tests/scripts/gitdiff_test.sh
+share/lcov/tests/scripts/gitversion_test.sh
+share/lcov/tests/scripts/p4annotate_test.sh
+share/lcov/tests/scripts/p4udiff_test.sh
+share/lcov/tests/scripts/p4version_test.sh
+share/lcov/tests/xml2lcov/Makefile
+share/lcov/tests/xml2lcov/coverage.xml
+share/lcov/tests/xml2lcov/xml2lcov.sh
diff --git a/lcov-git/distinfo b/lcov-git/distinfo
new file mode 100644
index 0000000000..14d23d8e38
--- /dev/null
+++ b/lcov-git/distinfo
@@ -0,0 +1,3 @@
+$NetBSD$
+
+SHA1 (patch-Makefile) = 9786797c5945e2b23df001da69c9a400c7072caa
diff --git a/lcov-git/patches/patch-Makefile b/lcov-git/patches/patch-Makefile
new file mode 100644
index 0000000000..9cd7af81e7
--- /dev/null
+++ b/lcov-git/patches/patch-Makefile
@@ -0,0 +1,18 @@
+$NetBSD$
+
+https://github.com/linux-test-project/lcov/issues/496
+
+--- Makefile.orig	2026-07-15 16:08:48.387376806 +0000
++++ Makefile
+@@ -190,9 +190,9 @@ endif
+ 	done
+ endif
+ 	for d in example tests ; do \
+-		( cd $$d ; make clean ) ; \
++		( cd $$d ; $(MAKE) clean ) ; \
+ 		find $$d -type d -exec mkdir -p -m 755 "$(SHARE_INST_DIR)/{}" \; ; \
+-		find $$d -type f -exec $(INSTALL) -Dm 644 "{}" "$(SHARE_INST_DIR)/{}" \; ; \
++		find $$d -type f -exec $(INSTALL) -m 644 "{}" "$(SHARE_INST_DIR)/{}" \; ; \
+ 	done
+ 	@chmod -R ugo+x $(SHARE_INST_DIR)/tests/bin
+ 	@find $(SHARE_INST_DIR)/tests \( -name '*.sh' -o -name '*.pl' \) -exec chmod ugo+x {} \;
Home | Main Index | Thread Index | Old Index