Bug#949788: s390-dasd FTCBFS: strips with the build architecture strip

2020-01-25 Thread Helmut Grohne 
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.0 +0200
+++ s390-dasd-0.0.65+nmu1/Makefile  2020-01-25 13:58:33.0 +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.0 +0100
+++ s390-dasd-0.0.65+nmu1/debian/changelog  2020-01-25 13:58:35.0 
+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   Sat, 25 Jan 2020 13:58:35 +0100
+
 s390-dasd (0.0.65) unstable; urgency=medium
 
   * Team upload

Bug#949788: s390-dasd FTCBFS: strips with the build architecture strip

2020-01-24 Thread Bastian Blank 
Moin

On Sat, Jan 25, 2020 at 05:50:40AM +0100, Helmut Grohne wrote:
> s390-dasd fails to cross build from source, because it strips using the
> build architecture strip during build. Beyond breaking cross
> compilation, this also breaks DEB_BUILD_OPTIONS=nostrip as well as
> generation of -dbgsym packages. It is best to defer all stripping to
> dh_strip. Please consider applying the attached patch.

This is the wrong fix.  Take a look at the Makefile.

Bastian

-- 
Time is fluid ... like a river with currents, eddies, backwash.
-- Spock, "The City on the Edge of Forever", stardate 3134.0

Bug#949788: s390-dasd FTCBFS: strips with the build architecture strip

2020-01-24 Thread Helmut Grohne 
Source: s390-dasd
Version: 0.0.65
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

s390-dasd fails to cross build from source, because it strips using the
build architecture strip during build. Beyond breaking cross
compilation, this also breaks DEB_BUILD_OPTIONS=nostrip as well as
generation of -dbgsym packages. It is best to defer all stripping to
dh_strip. Please consider applying the attached patch.

Helmut
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.0 +0100
+++ s390-dasd-0.0.65+nmu1/debian/changelog  2020-01-25 05:44:17.0 
+0100
@@ -1,3 +1,10 @@
+s390-dasd (0.0.65+nmu1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Defer stripping to dh_strip. (Closes: #-1)
+
+ -- Helmut Grohne   Sat, 25 Jan 2020 05:44:17 +0100
+
 s390-dasd (0.0.65) unstable; urgency=medium
 
   * Team upload
diff --minimal -Nru s390-dasd-0.0.65/debian/rules 
s390-dasd-0.0.65+nmu1/debian/rules
--- s390-dasd-0.0.65/debian/rules   2018-08-10 21:25:00.0 +0200
+++ s390-dasd-0.0.65+nmu1/debian/rules  2020-01-25 05:44:16.0 +0100
@@ -1,3 +1,6 @@
 #! /usr/bin/make -f
 %:
dh $@
+
+override_dh_auto_build:
+   dh_auto_build -- STRIP=true