aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2021-10-20 16:27:49 -0700
committerHauke Mehrtens <hauke@hauke-m.de>2021-11-02 23:37:19 +0100
commit9a329c4d87d0e830be833f4e06e679c2b8f74847 (patch)
tree744433ae10a24f8d7c7b9257a702667ee330a164
parentf7f12495bc9725e221b595680c47c4240d437abb (diff)
downloadupstream-9a329c4d87d0e830be833f4e06e679c2b8f74847.tar.gz
upstream-9a329c4d87d0e830be833f4e06e679c2b8f74847.tar.bz2
upstream-9a329c4d87d0e830be833f4e06e679c2b8f74847.zip
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 <rosenp@gmail.com>
-rw-r--r--package/devel/strace/Makefile2
-rw-r--r--package/devel/strace/patches/010-m4.patch10
2 files changed, 11 insertions, 1 deletions
diff --git a/package/devel/strace/Makefile b/package/devel/strace/Makefile
index a95d429311..8c4a26b63b 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 0000000000..478961ce26
--- /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 .)