Bug#1020875: z80asm: reproducible-builds: build path embedded in /usr/bin/z80asm
Hey, Thanks for your blessing. However, I'll leave it in DELAYED/10 just in case I discover something over the next week or so. :) Chris > Thanks! I didn't get around to this. I probably won't get around to uploading > it myself either, so feel free to skip the delayed queue, or else it'll get in > in 10 days. > > On Thu, Oct 06, 2022 at 09:16:23AM -0700, Chris Lamb wrote: >> tags 1020875 + pending patch >> tags 939775 + pending patch >> thanks >> >> I've uploaded z80asm 1.8-1.1 to DELAYED/10: >> >> z80asm (1.8-1.1) unstable; urgency=medium >> . >> * Non-maintainer upload. >> * Apply a patch by Vagrant Cascadian to make the build reproducible. The >> build path was being embedded in /usr/bin/z80asm. (Closes: #1020875) >> * Apply patch from Helmut Grohne to make as z80asm cross build >> correctly. It >> was failing because it ran its own testsuite despite the value of >> DEB_BUILD_OPTIONS=nocheck; the upstream build system ran them as part >> of >> the "build" target and offers no specific test target. (Closes: >> #939775) >> >> The full debdiff is attached. >> >> >> Regards, >> >> -- >> ,''`. >> : :' : Chris Lamb >> `. `'` la...@debian.org / chris-lamb.co.uk >>`- > >> diffstat for z80asm_1.8-1 z80asm_1.8-1.1 >> >> Makefile|1 - >> z80asm-1.8/debian/changelog | 12 >> z80asm-1.8/debian/rules |8 >> 3 files changed, 20 insertions(+), 1 deletion(-) >> >> diff -u z80asm-1.8/debian/changelog z80asm-1.8/debian/changelog >> --- z80asm-1.8/debian/changelog >> +++ z80asm-1.8/debian/changelog >> @@ -1,3 +1,15 @@ >> +z80asm (1.8-1.1) unstable; urgency=medium >> + >> + * Non-maintainer upload. >> + * Apply a patch by Vagrant Cascadian to make the build reproducible. The >> +build path was being embedded in /usr/bin/z80asm. (Closes: #1020875) >> + * Apply patch from Helmut Grohne to make as z80asm cross build correctly. >> It >> +was failing because it ran its own testsuite despite the value of >> +DEB_BUILD_OPTIONS=nocheck; the upstream build system ran them as part of >> +the "build" target and offers no specific test target. (Closes: #939775) >> + >> + -- Chris Lamb Thu, 06 Oct 2022 09:09:08 -0700 >> + >> z80asm (1.8-1) unstable; urgency=low >> >>* New upstream release. Fixes defw bug. (Closes: #519098) >> diff -u z80asm-1.8/debian/rules z80asm-1.8/debian/rules >> --- z80asm-1.8/debian/rules >> +++ z80asm-1.8/debian/rules >> @@ -1,3 +1,11 @@ >> #!/usr/bin/make -f >> %: >> dh $@ >> + >> +override_dh_auto_build: >> +dh_auto_build -- CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" >> + >> +override_dh_auto_test: >> +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) >> +$(MAKE) -C tests >> +endif >> --- z80asm-1.8.orig/Makefile >> +++ z80asm-1.8/Makefile >> @@ -25,7 +25,6 @@ >> >> z80asm: z80asm.o expressions.o Makefile gnulib/getopt.o gnulib/getopt1.o >> $(CC) $(LDFLAGS) $(filter %.o,$^) -o $@ >> -$(MAKE) -C tests || rm $@ >> >> %.o:%.c z80asm.h gnulib/getopt.h Makefile >> $(CC) $(CFLAGS) -c $< -o $@ -DVERSION=\"$(shell cat VERSION)\"
Bug#1020875: z80asm: reproducible-builds: build path embedded in /usr/bin/z80asm
Thanks! I didn't get around to this. I probably won't get around to uploading it myself either, so feel free to skip the delayed queue, or else it'll get in in 10 days. On Thu, Oct 06, 2022 at 09:16:23AM -0700, Chris Lamb wrote: > tags 1020875 + pending patch > tags 939775 + pending patch > thanks > > I've uploaded z80asm 1.8-1.1 to DELAYED/10: > > z80asm (1.8-1.1) unstable; urgency=medium > . > * Non-maintainer upload. > * Apply a patch by Vagrant Cascadian to make the build reproducible. The > build path was being embedded in /usr/bin/z80asm. (Closes: #1020875) > * Apply patch from Helmut Grohne to make as z80asm cross build correctly. > It > was failing because it ran its own testsuite despite the value of > DEB_BUILD_OPTIONS=nocheck; the upstream build system ran them as part of > the "build" target and offers no specific test target. (Closes: #939775) > > The full debdiff is attached. > > > Regards, > > -- > ,''`. > : :' : Chris Lamb > `. `'` la...@debian.org / chris-lamb.co.uk >`- > diffstat for z80asm_1.8-1 z80asm_1.8-1.1 > > Makefile|1 - > z80asm-1.8/debian/changelog | 12 > z80asm-1.8/debian/rules |8 > 3 files changed, 20 insertions(+), 1 deletion(-) > > diff -u z80asm-1.8/debian/changelog z80asm-1.8/debian/changelog > --- z80asm-1.8/debian/changelog > +++ z80asm-1.8/debian/changelog > @@ -1,3 +1,15 @@ > +z80asm (1.8-1.1) unstable; urgency=medium > + > + * Non-maintainer upload. > + * Apply a patch by Vagrant Cascadian to make the build reproducible. The > +build path was being embedded in /usr/bin/z80asm. (Closes: #1020875) > + * Apply patch from Helmut Grohne to make as z80asm cross build correctly. > It > +was failing because it ran its own testsuite despite the value of > +DEB_BUILD_OPTIONS=nocheck; the upstream build system ran them as part of > +the "build" target and offers no specific test target. (Closes: #939775) > + > + -- Chris Lamb Thu, 06 Oct 2022 09:09:08 -0700 > + > z80asm (1.8-1) unstable; urgency=low > >* New upstream release. Fixes defw bug. (Closes: #519098) > diff -u z80asm-1.8/debian/rules z80asm-1.8/debian/rules > --- z80asm-1.8/debian/rules > +++ z80asm-1.8/debian/rules > @@ -1,3 +1,11 @@ > #!/usr/bin/make -f > %: > dh $@ > + > +override_dh_auto_build: > + dh_auto_build -- CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" > + > +override_dh_auto_test: > +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) > + $(MAKE) -C tests > +endif > --- z80asm-1.8.orig/Makefile > +++ z80asm-1.8/Makefile > @@ -25,7 +25,6 @@ > > z80asm: z80asm.o expressions.o Makefile gnulib/getopt.o gnulib/getopt1.o > $(CC) $(LDFLAGS) $(filter %.o,$^) -o $@ > - $(MAKE) -C tests || rm $@ > > %.o:%.c z80asm.h gnulib/getopt.h Makefile > $(CC) $(CFLAGS) -c $< -o $@ -DVERSION=\"$(shell cat VERSION)\" signature.asc Description: PGP signature
Bug#1020875: z80asm: reproducible-builds: build path embedded in /usr/bin/z80asm
tags 1020875 + pending patch tags 939775 + pending patch thanks I've uploaded z80asm 1.8-1.1 to DELAYED/10: z80asm (1.8-1.1) unstable; urgency=medium . * Non-maintainer upload. * Apply a patch by Vagrant Cascadian to make the build reproducible. The build path was being embedded in /usr/bin/z80asm. (Closes: #1020875) * Apply patch from Helmut Grohne to make as z80asm cross build correctly. It was failing because it ran its own testsuite despite the value of DEB_BUILD_OPTIONS=nocheck; the upstream build system ran them as part of the "build" target and offers no specific test target. (Closes: #939775) The full debdiff is attached. Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `- diffstat for z80asm_1.8-1 z80asm_1.8-1.1 Makefile|1 - z80asm-1.8/debian/changelog | 12 z80asm-1.8/debian/rules |8 3 files changed, 20 insertions(+), 1 deletion(-) diff -u z80asm-1.8/debian/changelog z80asm-1.8/debian/changelog --- z80asm-1.8/debian/changelog +++ z80asm-1.8/debian/changelog @@ -1,3 +1,15 @@ +z80asm (1.8-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Apply a patch by Vagrant Cascadian to make the build reproducible. The +build path was being embedded in /usr/bin/z80asm. (Closes: #1020875) + * Apply patch from Helmut Grohne to make as z80asm cross build correctly. It +was failing because it ran its own testsuite despite the value of +DEB_BUILD_OPTIONS=nocheck; the upstream build system ran them as part of +the "build" target and offers no specific test target. (Closes: #939775) + + -- Chris Lamb Thu, 06 Oct 2022 09:09:08 -0700 + z80asm (1.8-1) unstable; urgency=low * New upstream release. Fixes defw bug. (Closes: #519098) diff -u z80asm-1.8/debian/rules z80asm-1.8/debian/rules --- z80asm-1.8/debian/rules +++ z80asm-1.8/debian/rules @@ -1,3 +1,11 @@ #!/usr/bin/make -f %: dh $@ + +override_dh_auto_build: + dh_auto_build -- CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" + +override_dh_auto_test: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + $(MAKE) -C tests +endif --- z80asm-1.8.orig/Makefile +++ z80asm-1.8/Makefile @@ -25,7 +25,6 @@ z80asm: z80asm.o expressions.o Makefile gnulib/getopt.o gnulib/getopt1.o $(CC) $(LDFLAGS) $(filter %.o,$^) -o $@ - $(MAKE) -C tests || rm $@ %.o:%.c z80asm.h gnulib/getopt.h Makefile $(CC) $(CFLAGS) -c $< -o $@ -DVERSION=\"$(shell cat VERSION)\"
Bug#1020875: z80asm: reproducible-builds: build path embedded in /usr/bin/z80asm
Source: z80asm Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/bin/z80asm: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/z80asm.html /build/1st/z80asm-1.8/z80asm.c:105 vs. /build/2/z80asm-1.8/2nd/z80asm.c:105 The attached patch to debian/rules fixes this by adding a dh_auto_build override that passes the default CFLAGS. Alternately, this might be fixed by updating to a newer debhelper compat level. According to my local tests, with this patch applied z80asm should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining z80asm! live well, vagrant From 5877483120c8c557aa53db6bcddd93af356e5724 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 27 Sep 2022 20:02:12 + Subject: [PATCH] debian/rules: Pass default CFLAGS via dh_auto_build override. --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index cbe925d..4a1ed37 100755 --- a/debian/rules +++ b/debian/rules @@ -1,3 +1,6 @@ #!/usr/bin/make -f %: dh $@ + +override_dh_auto_build: + dh_auto_build -- CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" -- 2.37.2 signature.asc Description: PGP signature
