Hi!
On Wed, 2024-07-24 at 14:37:53 +0200, Guillem Jover wrote:
> Both look like the same problem, which would be a regression from the
> recent rework of the Makefile fragments. I'm CCing Nicolas as a
> heads-up, and I'm looking into this to try to do a quick fix upload.
So there's something wrong with the variables evaluation, and the
following change makes these packages build again, but I don't
understand yet what's wrong with the first ifdef conditional arm.
And neither why the test suite didn't catch this, as it is
supposedly testing w/ and w/o SOURCE_DATE_EPOCH being set.
(I'll go for lunch now, so if someone else can have a look that'd
also be appreciated. :)
,---
diff --git i/scripts/mk/pkg-info.mk w/scripts/mk/pkg-info.mk
index ddda4f736..a2eb0d5fe 100644
--- i/scripts/mk/pkg-info.mk
+++ w/scripts/mk/pkg-info.mk
@@ -28,18 +28,8 @@ dpkg_parsechangelog_run = $(eval $(shell dpkg-parsechangelog
| sed -n '\
$$(eval DEB_VERSION_UPSTREAM:=\2\4)/p;\
s/^Timestamp: \(.*\)/$$(eval SOURCE_DATE_EPOCH?=\1)/p'))
-ifdef SOURCE_DATE_EPOCH
- dpkg_lazy_eval ?= $(eval $(1) = $(2)$$($(1)))
- $(call dpkg_lazy_eval,DEB_DISTRIBUTION,$$(dpkg_parsechangelog_run))
- $(call dpkg_lazy_eval,DEB_SOURCE,$$(dpkg_parsechangelog_run))
- $(call dpkg_lazy_eval,DEB_VERSION,$$(dpkg_parsechangelog_run))
- $(call dpkg_lazy_eval,DEB_VERSION_EPOCH_UPSTREAM,$$(dpkg_parsechangelog_run))
- $(call dpkg_lazy_eval,DEB_VERSION_UPSTREAM,$$(dpkg_parsechangelog_run))
- $(call dpkg_lazy_eval,DEB_UPSTREAM_REVISION,$$(dpkg_parsechangelog_run))
-else
- # We need to compute the values right now.
- $(dpkg_parsechangelog_run)
-endif
+# We need to compute the values right now.
+$(dpkg_parsechangelog_run)
export SOURCE_DATE_EPOCH
endif # dpkg_pkg_info_mk_included
`---
Thanks,
Guillem
