Bug#949788: s390-dasd FTCBFS: strips with the build architecture strip
On Sat, Jan 25, 2020 at 08:09:57AM +0100, Bastian Blank wrote:
> This is the wrong fix. Take a look at the Makefile.
Thank you. Patch updated.
Helmut
diff --minimal -Nru s390-dasd-0.0.65/Makefile s390-dasd-0.0.65+nmu1/Makefile
--- s390-dasd-0.0.65/Makefile 2018-08-10 21:25:00.000000000 +0200
+++ s390-dasd-0.0.65+nmu1/Makefile 2020-01-25 13:58:33.000000000 +0100
@@ -10,20 +10,12 @@
CFLAGS := -Wall -W -pipe -Os -I/usr/include/sysfs
LDFLAGS := -ldebconfclient -ldebian-installer -lsysfs
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
-STRIP = /bin/true
-else
-CFLAGS += -fomit-frame-pointer
-STRIPTOOL=strip
-STRIP = $(STRIPTOOL) --remove-section=.note --remove-section=.comment
-endif
all: dasd-config
dasd-config: dasd-config.c
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
- $(STRIP) $@
clean:
rm -f dasd-config
diff --minimal -Nru s390-dasd-0.0.65/debian/changelog s390-dasd-0.0.65+nmu1/debian/changelog
--- s390-dasd-0.0.65/debian/changelog 2019-11-13 23:43:24.000000000 +0100
+++ s390-dasd-0.0.65+nmu1/debian/changelog 2020-01-25 13:58:35.000000000 +0100
@@ -1,3 +1,10 @@
+s390-dasd (0.0.65+nmu1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: Let dh_strip handle stripping. (Closes: 949788)
+
+ -- Helmut Grohne <helmut@subdivi.de> Sat, 25 Jan 2020 13:58:35 +0100
+
s390-dasd (0.0.65) unstable; urgency=medium
* Team upload
Reply to: