[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#914911: x11-apps: reproducible build (usrmerge): Embeds full path to mktemp found via PATH



On Wed, Nov 28, 2018 at 03:44:01PM +0100, Andreas Henriksson wrote:
> Package: x11-apps
> Version: 7.7+7
> Severity: normal
> Tags: patch
[...]

Got some feedback. Improved patch attached.

Regards,
Andreas Henriksson
diff -Nru x11-apps-7.7+7/debian/changelog x11-apps-7.7+7+nmu1/debian/changelog
--- x11-apps-7.7+7/debian/changelog	2018-03-18 17:07:42.000000000 +0100
+++ x11-apps-7.7+7+nmu1/debian/changelog	2018-11-28 16:05:57.000000000 +0100
@@ -1,3 +1,11 @@
+x11-apps (7.7+7+nmu1) UNRELEASED; urgency=medium
+
+  * Pass MKTEMP=/bin/mktemp to configure to fix reproducible build
+    on merged-usr vs non-merged systems (x11perfcomp embeds the path).
+    (Closes: #914911)
+
+ -- Andreas Henriksson <andreas@fatal.se>  Wed, 28 Nov 2018 16:05:57 +0100
+
 x11-apps (7.7+7) unstable; urgency=medium
 
   * Switch all xorg.freedesktop.org URLs in packaging to https.
diff -Nru x11-apps-7.7+7/debian/rules x11-apps-7.7+7+nmu1/debian/rules
--- x11-apps-7.7+7/debian/rules	2015-04-30 23:56:55.000000000 +0200
+++ x11-apps-7.7+7+nmu1/debian/rules	2018-11-28 16:05:51.000000000 +0100
@@ -30,7 +30,8 @@
 	dh_auto_configure -D$* -B$*-build -- \
 		--libdir=\$${prefix}/lib \
 		--disable-silent-rules \
-		MANCONF="/etc/manpath.config"
+		MANCONF="/etc/manpath.config" \
+		MKTEMP=/bin/mktemp
 	>$@
 
 override_dh_auto_build: $(BUILD_STAMPS)

Reply to: