Source: paraview
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: kernel
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org
The running kernel version is embedded in various files and binaries:
https://tests.reproducible-builds.org/debian/rb-pkg/bullseye/i386/diffoscope-results/paraview.html
/usr/include/paraview-5.9/catalyst/conduit_config.h
#define·CONDUIT_SYSTEM_TYPE·"Linux-4.19.0-14-686-pae"
vs.
#define·CONDUIT_SYSTEM_TYPE·"Linux-4.19.0-14-amd64"
That attached two patches fix this by using CMAKE_SYSTEM_NAME instead of
CMAKE_SYSTEM. It builds fine, though someone familiar with the code
should verify that it actually works correctly before applying the
patches.
This appears to be fixed in vtk7 in https://bugs.debian.org/977530, but
since paraview uses an embedded code copy, needs to be fixed here too.
Thanks for maintaining paraview!
live well,
vagrant
From 8fb482790cdbfc5dd8bc76b2c8b75de2c0614326 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian
Date: Fri, 26 Feb 2021 08:19:28 +
Subject: [PATCH 1/4] conduit_config.h.in: Do not embed the kernel version of
the build machine.
Use CMAKE_SYSTEM_NAME instead of CMAKE_SYSTEM to avoid embedding the
kernel version of the build machine.
https://tests.reproducible-builds.org/debian/issues/unstable/captures_kernel_version_via_CMAKE_SYSTEM_issue.html
---
.../catalyst/thirdparty/conduit/conduit/conduit_config.h.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ThirdParty/catalyst/vtkcatalyst/catalyst/thirdparty/conduit/conduit/conduit_config.h.in b/ThirdParty/catalyst/vtkcatalyst/catalyst/thirdparty/conduit/conduit/conduit_config.h.in
index 95fb51cd..8697730f 100644
--- a/ThirdParty/catalyst/vtkcatalyst/catalyst/thirdparty/conduit/conduit/conduit_config.h.in
+++ b/ThirdParty/catalyst/vtkcatalyst/catalyst/thirdparty/conduit/conduit/conduit_config.h.in
@@ -71,7 +71,7 @@
#cmakedefine CONDUIT_GIT_SHA1 "${CONDUIT_GIT_SHA1}"
-#define CONDUIT_SYSTEM_TYPE "@CMAKE_SYSTEM@"
+#define CONDUIT_SYSTEM_TYPE "@CMAKE_SYSTEM_NAME@"
#define CONDUIT_CPP_COMPILER "@CMAKE_CXX_COMPILER@"
--
2.20.1
From ddef60f591e554379f084476ea9ba70369b4555b Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian
Date: Fri, 26 Feb 2021 08:22:03 +
Subject: [PATCH 2/4] XdmfConfig.h.in: Do not embed the kernel version of the
build machine.
Use CMAKE_SYSTEM_NAME instead of CMAKE_SYSTEM to avoid embedding the
kernel version of the build machine.
https://tests.reproducible-builds.org/debian/issues/unstable/captures_kernel_version_via_CMAKE_SYSTEM_issue.html
---
VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfConfig.h.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfConfig.h.in b/VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfConfig.h.in
index bb49d09c..26ba625c 100644
--- a/VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfConfig.h.in
+++ b/VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfConfig.h.in
@@ -32,7 +32,7 @@
#define XDMF_BYTE_ORDER_LITTLE
#endif
-#define XDMF_SYSTEM ${CMAKE_SYSTEM}
+#define XDMF_SYSTEM ${CMAKE_SYSTEM_NAME}
#cmakedefine XDMF_VOID_VALID
#ifndef XDMF_VOID_VALID
--
2.20.1
signature.asc
Description: PGP signature
