Source: stress-ng
Version: 0.11.21-1
Tags: patch
I looked into why stress-ng would fail cross building and found that the
build log missed all the compiler invocations. The Debian policy
recommends building verbosely by default. I'm attaching a patch to
implement that for your convenience. The upstream build keeps building
quietly by default. The Debian build is verbose unless you pass
DEB_BUILD_OPTIONS=terse as recommended by the policy.
Helmut
diff --minimal -Nru stress-ng-0.11.21/debian/changelog
stress-ng-0.11.21/debian/changelog
--- stress-ng-0.11.21/debian/changelog 2020-09-16 23:58:21.000000000 +0200
+++ stress-ng-0.11.21/debian/changelog 2020-10-05 06:53:49.000000000 +0200
@@ -1,3 +1,10 @@
+stress-ng (0.11.21-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Enable verbose build logs. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Mon, 05 Oct 2020 06:53:49 +0200
+
stress-ng (0.11.21-1) unstable; urgency=medium
[Colin Ian King]
diff --minimal -Nru stress-ng-0.11.21/debian/patches/series
stress-ng-0.11.21/debian/patches/series
--- stress-ng-0.11.21/debian/patches/series 1970-01-01 01:00:00.000000000
+0100
+++ stress-ng-0.11.21/debian/patches/series 2020-10-05 06:15:45.000000000
+0200
@@ -0,0 +1 @@
+verbose.patch
diff --minimal -Nru stress-ng-0.11.21/debian/patches/verbose.patch
stress-ng-0.11.21/debian/patches/verbose.patch
--- stress-ng-0.11.21/debian/patches/verbose.patch 1970-01-01
01:00:00.000000000 +0100
+++ stress-ng-0.11.21/debian/patches/verbose.patch 2020-10-05
06:53:49.000000000 +0200
@@ -0,0 +1,133 @@
+--- stress-ng-0.11.21.orig/Makefile
++++ stress-ng-0.11.21/Makefile
+@@ -33,6 +33,15 @@
+ -Wno-missing-braces -Wno-sign-compare -Wno-multichar
+ endif
+
++# Verbosity
++ifeq ($(VERBOSE),)
++V=@
++Q=@
++else
++V=
++Q=@#
++endif
++
+ GREP = grep
+ #
+ # SunOS requires special grep for -e support
+@@ -361,16 +370,16 @@
+ .o: stress-ng.h Makefile
+
+ .c.o:
+- @echo "CC $<"
+- @$(CC) $(CFLAGS) -c -o $@ $<
++ $(Q)echo "CC $<"
++ $(V)$(CC) $(CFLAGS) -c -o $@ $<
+
+ stress-ng: $(OBJS)
+- @echo "LD $@"
+- @$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -o $@
+- @sync
++ $(Q)echo "LD $@"
++ $(V)$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -o $@
++ $(V)sync
+
+ makeconfig:
+- @if [ ! -e config ]; then \
++ $(V)if [ ! -e config ]; then \
+ STATIC=$(STATIC) $(MAKE) -f Makefile.config; \
+ fi
+
+@@ -379,25 +388,25 @@
+ # parser output
+ #
+ apparmor-data.o: usr.bin.pulseaudio.eg
+- @$(APPARMOR_PARSER) -Q usr.bin.pulseaudio.eg -o apparmor-data.bin
+- @echo "#include <stddef.h>" > apparmor-data.c
+- @echo "char g_apparmor_data[]= { " >> apparmor-data.c
+- @od -tx1 -An -v < apparmor-data.bin | \
++ $(V)$(APPARMOR_PARSER) -Q usr.bin.pulseaudio.eg -o apparmor-data.bin
++ $(V)echo "#include <stddef.h>" > apparmor-data.c
++ $(V)echo "char g_apparmor_data[]= { " >> apparmor-data.c
++ $(V)od -tx1 -An -v < apparmor-data.bin | \
+ sed 's/[0-9a-f][0-9a-f]/0x&,/g' | \
+ sed '$$ s/.$$//' >> apparmor-data.c
+- @echo "};" >> apparmor-data.c
+- @echo "const size_t g_apparmor_data_len = sizeof(g_apparmor_data);" >>
apparmor-data.c
+- @echo "CC $<"
+- @$(CC) -c apparmor-data.c -o apparmor-data.o
+- @rm -rf apparmor-data.c apparmor-data.bin
++ $(V)echo "};" >> apparmor-data.c
++ $(V)echo "const size_t g_apparmor_data_len = sizeof(g_apparmor_data);"
>> apparmor-data.c
++ $(Q)echo "CC $<"
++ $(V)$(CC) -c apparmor-data.c -o apparmor-data.o
++ $(V)rm -rf apparmor-data.c apparmor-data.bin
+
+ #
+ # extract the PER_* personality enums
+ #
+ personality.h:
+- @$(CPP) $(CONFIG_CFLAGS) core-personality.c | $(GREP) -e "PER_[A-Z0-9]*
=.*," | cut -d "=" -f 1 \
++ $(V)$(CPP) $(CONFIG_CFLAGS) core-personality.c | $(GREP) -e
"PER_[A-Z0-9]* =.*," | cut -d "=" -f 1 \
+ | sed "s/.$$/,/" > personality.h
+- @echo "MK personality.h"
++ $(Q)echo "MK personality.h"
+
+ stress-personality.c: personality.h
+
+@@ -406,23 +415,23 @@
+ # so we can check if these enums exist
+ #
+ io-uring.h:
+- @$(CPP) $(CONFIG_CLFAGS) core-io-uring.c | grep IORING_OP | sed
's/,//' | \
++ $(V)$(CPP) $(CONFIG_CLFAGS) core-io-uring.c | grep IORING_OP | sed
's/,//' | \
+ sed 's/IORING_OP_/#define HAVE_IORING_OP_/' > io-uring.h
+- @echo "MK io-uring.h"
++ $(Q)echo "MK io-uring.h"
+
+ stress-io-uring.c: io-uring.h
+
+ core-perf.o: core-perf.c core-perf-event.c
+- @$(CC) $(CFLAGS) -E core-perf-event.c | grep "PERF_COUNT" | \
++ $(V)$(CC) $(CFLAGS) -E core-perf-event.c | grep "PERF_COUNT" | \
+ sed 's/,/ /' | sed s/'^ *//' | \
+ awk {'print "#define _SNG_" $$1 " (1)"'} > core-perf-event.h
+- @echo CC $<
+- @$(CC) $(CFLAGS) -c -o $@ $<
++ $(Q)echo CC $<
++ $(V)$(CC) $(CFLAGS) -c -o $@ $<
+
+ stress-vecmath.o: stress-vecmath.c
+- @echo CC $<
+- @$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
+- @touch stress-ng.c
++ $(Q)echo CC $<
++ $(V)$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
++ $(V)touch stress-ng.c
+
+ $(OBJS): stress-ng.h Makefile
+
+@@ -450,14 +459,14 @@
+
+ .PHONY: clean
+ clean:
+- @rm -f stress-ng $(OBJS) stress-ng.1.gz stress-ng.pdf
+- @rm -f stress-ng-$(VERSION).tar.xz
+- @rm -f personality.h
+- @rm -f io-uring.h
+- @rm -f perf-event.h
+- @rm -f apparmor-data.bin
+- @rm -f *.o
+- @rm -f config
++ $(V)rm -f stress-ng $(OBJS) stress-ng.1.gz stress-ng.pdf
++ $(V)rm -f stress-ng-$(VERSION).tar.xz
++ $(V)rm -f personality.h
++ $(V)rm -f io-uring.h
++ $(V)rm -f perf-event.h
++ $(V)rm -f apparmor-data.bin
++ $(V)rm -f *.o
++ $(V)rm -f config
+
+ .PHONY: fast-test-all
+ fast-test-all: all
diff --minimal -Nru stress-ng-0.11.21/debian/rules
stress-ng-0.11.21/debian/rules
--- stress-ng-0.11.21/debian/rules 2020-09-16 23:58:21.000000000 +0200
+++ stress-ng-0.11.21/debian/rules 2020-10-05 06:53:46.000000000 +0200
@@ -5,7 +5,7 @@
include /usr/share/dpkg/buildflags.mk
override_dh_auto_build:
- $(shell dpkg-buildflags --export=sh); dh_auto_build
+ $(shell dpkg-buildflags --export=sh); dh_auto_build -- $(if $(filter
terse,$(DEB_BUILD_OPTIONS)),,VERBOSE=1)
override_dh_dwz:
