From 5ac4ca6b1462bc8b894ba4b120d8e33a70be62c0 Mon Sep 17 00:00:00 2001 From: Rhonda D'Vine Date: Fri, 13 May 2022 20:12:40 +0800 Subject: [PATCH 1/2] Remove --force option from po4a calls The --force option forced a regenerate of the pot files on every call, hindering the reproducible buildability of the package Gbp-Pq: Name GNUmakefile_remove---force-from-po4a-call --- GNUmakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 6051159..88e98ad 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -173,12 +173,12 @@ po/dctrl-tools.pot : $(src) lib/msg.h # create (or update) dctrl-tools-man.pot man/po4a/po/dctrl-tools-man.pot : touch man/po4a/po/dctrl-tools-man.pot - $(PO4A) --force --no-translations $(PO4A_CONFIG) + $(PO4A) --no-translations $(PO4A_CONFIG) # build translated manpages in man/translated/$lang/ po4a : touch man/po4a/po/dctrl-tools-man.pot - $(PO4A) --force --no-backups $(PO4A_CONFIG) + $(PO4A) --no-backups $(PO4A_CONFIG) # handle the "%.1 : %.1.cp" rule if and only if the grep-dctrl.1.cp file exists translated-man : po4a From d9b446e95b91a7ca1ba9079dae0ad3a66d643bf1 Mon Sep 17 00:00:00 2001 From: Reiner Herrmann Date: Fri, 13 May 2022 20:12:40 +0800 Subject: [PATCH 2/2] Sort object files for deterministic linking order Gbp-Pq: Name reproducible_build.patch --- GNUmakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 88e98ad..75f108f 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -31,7 +31,7 @@ PO4A = po4a PO4A_CONFIG = man/po4a/po4a.cfg libsrc = $(wildcard lib/*.c) -libobj = $(libsrc:.c=.o) +libobj = $(sort $(libsrc:.c=.o)) src = $(libsrc) \ $(wildcard grep-dctrl/*.c) \ @@ -39,7 +39,7 @@ src = $(libsrc) \ $(wildcard tbl-dctrl/*.c) \ $(wildcard join-dctrl/*.c) -obj = $(src:.c=.o) +obj = $(sort $(src:.c=.o)) exe = grep-dctrl/grep-dctrl \ sort-dctrl/sort-dctrl \