Source: vtk7
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 is embedded in /usr/include/vtk-7.1/vtkxdmf2/XdmfConfig.h:

  
https://tests.reproducible-builds.org/debian/rb-pkg/bullseye/amd64/diffoscope-results/vtk7.html
  
  34    #define·XDMF_SYSTEM·Linux-5.8.0-0.bpo.2-amd64
  34    #define·XDMF_SYSTEM·Linux-4.19.0-12-amd64


The attached patch fixes this by using CMAKE_SYSTEM_NAME (e.g. Linux)
instead of CMAKE_SYSTEM (e.g. Linux-4.19.0-12-amd64) to set the
XDMF_SYSTEM header.


Thanks for maintaining vtk7!


live well,
  vagrant
From 73c5fc29fc6694aa95d0c48ac748d5c9e22080f1 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagr...@reproducible-builds.org>
Date: Wed, 16 Dec 2020 02:32:12 +0000
Subject: [PATCH 2/3] XdmfConfig.h.in: Set XDMF_SYSTEM using CMAKE_SYSTEM_NAME.

Using CMAKE_SYSTEM embeds the running kernel in the resulting .h file,
which will likely vary between builds and other systems that use the
.h file.

https://tests.reproducible-builds.org/debian/issues/unstable/captures_kernel_version_via_CMAKE_SYSTEM_issue.html
---
 ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfConfig.h.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfConfig.h.in b/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfConfig.h.in
index 04f82a5..845ea3f 100644
--- a/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfConfig.h.in
+++ b/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.29.2

Attachment: signature.asc
Description: PGP signature

Reply via email to