From 9a329c4d87d0e830be833f4e06e679c2b8f74847 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 20 Oct 2021 16:27:49 -0700 Subject: [PATCH] strace: remove code coverage makefile var It relies on a custom ax_code_coverage.m4 file included with strace. Unfortunately, this conflicts with the one included with autoconf-macros. Instead of creating a huge patch to fix it, just remove the variable as code coverage is not used here. Signed-off-by: Rosen Penev --- package/devel/strace/Makefile | 2 +- package/devel/strace/patches/010-m4.patch | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 package/devel/strace/patches/010-m4.patch diff --git a/package/devel/strace/Makefile b/package/devel/strace/Makefile index a95d429311a..8c4a26b63b2 100644 --- a/package/devel/strace/Makefile +++ b/package/devel/strace/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=strace PKG_VERSION:=5.10 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://strace.io/files/$(PKG_VERSION) diff --git a/package/devel/strace/patches/010-m4.patch b/package/devel/strace/patches/010-m4.patch new file mode 100644 index 00000000000..478961ce26e --- /dev/null +++ b/package/devel/strace/patches/010-m4.patch @@ -0,0 +1,10 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -408,7 +408,6 @@ strace_LDADD += $(libiberty_LIBS) + endif + endif + +-@CODE_COVERAGE_RULES@ + CODE_COVERAGE_BRANCH_COVERAGE = 1 + CODE_COVERAGE_GENHTML_OPTIONS = $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT) \ + --prefix $(shell cd $(abs_top_srcdir)/.. && pwd || echo .) -- 2.30.2