diffoscope timing out.
Jan-Benedict Glaw
jbglaw at lug-owl.de
Mon Nov 6 09:09:19 GMT 2023
Hi!
On Sun, 2023-11-05 11:16:29 -0500, Christos Zoulas <christos at zoulas.com> wrote:
> For weeks now there is no useful output from diffoscope. Is there anything I
> can do to help debug the issue?
>
> tests.reproducible-builds.org [eeB]
> Wed 1 Nov 23:35:09 UTC 2023 - diffoscope 251 produced no output for
> x86_64-amd64/amd64/binary/sets/comp.tar.xz and was killed after running into
> timeout after 30m...
I cannot help with diffoscope. BUT I changed the NetBSD rb script to
use two different build pathes which resulted in differences in
comp.tar.gz . I've worked on that during the last days (testing with
VAX) and my most recent build suggests that this patch might fix the
issue (untested on any other port---that will happen for my next
complete build run.) Once tested, I'd actually submit the patch, but
here it is already (for discussion only):
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index bc20ff87b096..802fe2fffc73 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -21,6 +21,7 @@ error2:
.if !empty(DESTDIR)
CPPFLAGS+= -Wp,-iremap,${DESTDIR}:
REPROFLAGS+= -fdebug-prefix-map=\$$DESTDIR=
+REPROFLAGS+= -fmacro-prefix-map=\$$DESTDIR=
.endif
CPPFLAGS+= -Wp,-fno-canonical-system-headers
@@ -29,6 +30,8 @@ CPPFLAGS+= -Wp,-iremap,${X11SRCDIR}:/usr/xsrc
REPROFLAGS+= -fdebug-prefix-map=\$$NETBSDSRCDIR=/usr/src
REPROFLAGS+= -fdebug-prefix-map=\$$X11SRCDIR=/usr/xsrc
+REPROFLAGS+= -fmacro-prefix-map=\$$NETBSDSRCDIR=/usr/src
+REPROFLAGS+= -fmacro-prefix-map=\$$X11SRCDIR=/usr/xsrc
.if defined(MAKEOBJDIRPREFIX)
NETBSDOBJDIR= ${MAKEOBJDIRPREFIX}${NETBSDSRCDIR}
.endif
@@ -36,6 +39,7 @@ NETBSDOBJDIR= ${MAKEOBJDIRPREFIX}${NETBSDSRCDIR}
.if defined(NETBSDOBJDIR)
.export NETBSDOBJDIR
REPROFLAGS+= -fdebug-prefix-map=\$$NETBSDOBJDIR=/usr/obj
+REPROFLAGS+= -fmacro-prefix-map=\$$NETBSDOBJDIR=/usr/obj
.endif
LINTFLAGS+= -R${NETBSDSRCDIR}=/usr/src -R${X11SRCDIR}=/usr/xsrc
MfG, JBG
--
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/reproducible-builds/attachments/20231106/c8c6425e/attachment.sig>
More information about the Reproducible-builds
mailing list