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

Bug#948757: apache2: embeds path to EGREP in config_vars.mk



Source: apache2
Version: 2.4.41-1
Severity: wishlist
Tags: patch
User: reproducible-builds@lists.alioth.debian.org
Usertags: usrmerge
X-Debbugs-Cc: reproducible-bugs@lists.alioth.debian.org

The EGREP variable is stored in config_vars.mk and is derived from the
GREP variable, which may get set to /bin/grep or /usr/bin/grep on
usrmerge where /bin is a symlink to /usr/bin.

The attached patch sets GREP=/bin/grep in the configure phase to work
around this issue, since /bin/grep will work correctly on both usrmerge
and non-usrmerge systems.

Thanks for maintaining apache2!

live well,
  vagrant
From 15184b6753b84174535d29360672f9362e288d76 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Sun, 12 Jan 2020 17:44:23 -0800
Subject: [PATCH] Set GREP=/bin/grep during configure for reproducible builds.

The EGREP variable is stored in config_vars.mk and is derived from the
GREP variable, which may get set to /bin/grep or /usr/bin/grep on
usrmerge where /bin is a symlink to /usr/bin.
---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 44cfa8a0..508dde96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -117,7 +117,7 @@ configure-stamp: prebuild-checks-stamp support/suexec-custom.c
 		--enable-mods-shared="all brotli cgi ident authnz_fcgi imagemap cern_meta proxy_fdpass proxy_http2 bucketeer case_filter case_filter_in" \
 		--enable-mods-static="unixd logio watchdog version" \
 		CFLAGS="$(AP2_CFLAGS)" CPPFLAGS="$(AP2_CPPFLAGS)" LDFLAGS="$(AP2_LDFLAGS)" \
-		LTFLAGS="$(AP2_LTFLAGS)" SHELL=/bin/bash
+		LTFLAGS="$(AP2_LTFLAGS)" SHELL=/bin/bash GREP=/bin/grep
 	touch $@
 
 debian/config-dir/apache2.conf: debian/config-dir/apache2.conf.in
-- 
2.20.1

Attachment: signature.asc
Description: PGP signature


Reply to: