Martin Uecker pushed to branch master at Debian Med / bart
Commits: bfdf7be5 by Martin Uecker at 2026-05-10T09:59:42+02:00 cleanup old code for deterministic builds - - - - - 0a732877 by Martin Uecker at 2026-05-10T09:59:49+02:00 deterministic archives - - - - - a75505d8 by Martin Uecker at 2026-05-10T10:00:59+02:00 turn off hanging test - - - - - 3 changed files: - + debian/patches/0009-deterministic-archives.patch - debian/patches/series - debian/rules Changes: ===================================== debian/patches/0009-deterministic-archives.patch ===================================== @@ -0,0 +1,28 @@ +From: Martin Uecker <[email protected]> +Date: Sun, 10 May 2026 08:43:28 +0200 +Subject: deterministic archives + +--- + Makefile | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +diff --git a/Makefile b/Makefile +index 77d7a70..f5afd7d 100644 +--- a/Makefile ++++ b/Makefile +@@ -122,13 +122,8 @@ else + endif + + +-ifeq ($(BUILDTYPE), Linux) +- # as the defaults changed on most Linux distributions +- # explicitly specify non-deterministic archives to not break make +- ARFLAGS ?= rsU +-else +- ARFLAGS ?= rs +-endif ++ ++ARFLAGS ?= rs + + + ifeq ($(UNAME),Cygwin) ===================================== debian/patches/series ===================================== @@ -6,3 +6,4 @@ 0006-remove-exec-command-mechanism.patch 0007-fix-initialization-for-direct-call-of-tools.patch 0008-do-not-delete-command.txt.patch +0009-deterministic-archives.patch ===================================== debian/rules ===================================== @@ -9,17 +9,13 @@ include /usr/share/dpkg/buildtools.mk # set installation prefix export PREFIX=/usr/ -# turn of parallel builds here to make build deterministic -export PARALLEL=1 -export PARALLEL_NJOBS=1 - # some archs require turning of some optimizations NOEXPOPT_ARCHS= # turn off hanging tests on i386 -#ifeq ($(DEB_BUILD_ARCH), i386) -#export ODE_SIMU_OFF=1 -#endif +ifeq ($(DEB_BUILD_ARCH), i386) +export ODE_SIMU_OFF=1 +endif ifneq (,$(filter $(NOEXPOPT_ARCHS), $(DEB_BUILD_ARCH))) export DEB_CFLAGS_MAINT_APPEND = -fno-expensive-optimizations View it on GitLab: https://salsa.debian.org/med-team/bart/-/compare/3fa568da903d331a1df79ee5de413f2f502ebeaf...a75505d81d475acbcdf10b5249200ac5d4752efb -- View it on GitLab: https://salsa.debian.org/med-team/bart/-/compare/3fa568da903d331a1df79ee5de413f2f502ebeaf...a75505d81d475acbcdf10b5249200ac5d4752efb You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
