On 2022-01-17, Andreas Tille wrote:
> are you sure you picked the right code to patch?  The code in Git[1]
> is very different from the chunk your patch claims to replace.  While
> I could easily add -DCMAKE_BUILD_RPATH_USE_ORIGIN=ON to dh_auto_configure
> but I wanted to make sure that there is no other package you intended
> to fix that way.

Oops, must have gotten the patch mixed up with another package!

The originally intended patch should be attached.


live well,
  vagrant
From b7e78e09b4c2f4589f33f987718640a49d5f719f Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagr...@reproducible-builds.org>
Date: Sun, 16 Jan 2022 01:44:10 +0000
Subject: [PATCH] debian/rules: Pass -DCMAKE_BUILD_RPATH_USE_ORIGIN=ON via
 dh_auto_configure override.

This avoids embedding the full path in RPATH, which triggers BuildId
differences.

https://tests.reproducible-builds.org/debian/issues/unstable/cmake_rpath_contains_build_path_issue.html
---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index f8da7b8..1e87b1f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ override_dh_auto_clean:
 	dh_auto_clean || true
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DOPENMP=ON
+	dh_auto_configure -- -DOPENMP=ON -DCMAKE_BUILD_RPATH_USE_ORIGIN=ON
 
 override_dh_auto_build:
 	dh_auto_build
-- 
2.34.1

Attachment: signature.asc
Description: PGP signature

Reply via email to