On 2021-07-12, Vagrant Cascadian wrote: > On 2021-03-08, Chris Lamb wrote: >> Whilst working on the Reproducible Builds effort [0] we noticed that >> php8.0 could not be built reproducibly. >> >> Patch attached to make the build-defs.h, /usr/bin/php-config8.0 and >> test-results.txt.gz reproducible. > > The test-results.txt.gz also embeds the hostname, kernel version, build > time, etc. ... > > > https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/php8.0.html > > Some of these things may be sanitized usefully (although perhaps a bit > of a whack-a-mole game over time), but if any sort of timing information > is desired, sanitizing that data would defeat the purpose of the log. > > We had a similar discussion for binutils which does something similar: > > https://bugs.debian.org/950585 > > > If the test suite output is not too huge, I think it might be better to > not ship test-results.txt in the package, but to output the contents to > the build log (so you could access the necessary test-results from > buildd.debian.org).
Apparently php8.0 already outputs the test-results.txt to the build log. An updated patch that simply doesn't install test-restults.txt is attached. live well, vagrant
diff --git a/debian/rules b/debian/rules index 8aa4d27..8696a51 100755 --- a/debian/rules +++ b/debian/rules @@ -519,9 +519,14 @@ override_dh_install-arch: remove-files-stamp prepare-fpm-pools ifeq (yes,$(RUN_TESTS)) mkdir -p debian/$(PHP_COMMON)/usr/share/doc/$(PHP_COMMON)/ - cp test-results.txt debian/$(PHP_COMMON)/usr/share/doc/$(PHP_COMMON)/ endif + $(SED) -i -e's@-ffile-prefix-map=[^ ]*[ ]*@@g' \ + -e's@-fdebug-prefix-map=[^ ]*[ ]*@@g' \ + -e's@$(CURDIR)@/tmp/buildd/nonexistent@g' \ + debian/$(PHP_DEV)/usr/include/php/*/main/build-defs.h \ + debian/$(PHP_DEV)/usr/bin/php-config$(PHP_NAME_VERSION) + override_dh_installinit: dh_installinit --restart-after-upgrade
signature.asc
Description: PGP signature
