Source: geoip
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: usrmerge environment
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org

When geoip is built on a system with usrmerge installed, it produces a
different /usr/share/doc/libgeoip-dev/examples/Makefile:

  EGREP·​=·​/​bin/​grep·​-​E

vs.

  EGREP·​=·​/​usr/​bin/​grep·​-​E

The attached patch to debian/rules sets various values to the
non-usrmerged /bin path, since it's compatible with both usrmerge and
non-usrmerge systems.


Thanks for maintaining geoip!


live well,
  vagrant

From 374efa2b074b88a4b8e6c8d7b990b34474712b6c Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagr...@reproducible-builds.org>
Date: Sat, 18 Jan 2020 21:58:57 -0800
Subject: [PATCH 1/2] debian/rules: Add dh_auto_configure override to pass
 GREP, MKDIR_P, SED and SHELL to ensure reproducible builds even on systems
 with a merged /usr.

---
 debian/rules | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/rules b/debian/rules
index e269d26..eaaf945 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,9 @@ override_dh_auto_install:
 		-I $(CURDIR)/debian/tmp/usr/include/ -L $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
 	chrpath -d -k debian/tmp/usr/bin/geoip*
 
+override_dh_auto_configure:
+	dh_auto_configure -- GREP=/bin/grep MKDIR_P="/bin/mkdir -p" SED=/bin/sed SHELL=/bin/bash
+
 override_dh_install:
 	dh_install
 	strip --remove-section=.comment \
-- 
2.20.1

Attachment: signature.asc
Description: PGP signature

Reply via email to