From 93cd5a3142fc8ed315dfbbaaf06012af59aea0a4 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jerome@riseup.net>
Date: Sat, 23 Jan 2021 12:14:27 -0500
Subject: [PATCH] assume clean build environment, see DEBBUG-915222
This is part of a fix for reproducible builds where usrmerge may or may
not be in effect on the build system. We need to be able to pass the
BASH envvar to autotools so its able to correctly determine the correct
path for bash. The lines removed here were added to fix DEBBUG-346303
but should not be required on a clean build environment, where BASH
remains unset unless the current shell is actually BASH, and when it is,
should return the correct path to the bash executable and not /bin/sh.
---
CHANGELOG.md | 1 +
configure.ac | 3 ---
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5469374..e94787c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
+- [build] make build reproducible regardless of usrmerge (DEBBUG-915222)
- [core] silence exit code message unless --debug is used
## [1.2.0] - 2021-01-21
diff --git a/configure.ac b/configure.ac
index 891bb0f..91d7006 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,9 +9,6 @@ AM_INIT_AUTOMAKE([foreign])
# Checks for programs.
-# BASH may already be set in the shell, if the admin then changes the
-# the /bin/sh symlink to a non-bash shell, all hell will break lose.
-unset BASH
AC_PATH_PROGS(BASH, bash, "no", [$PATH:/bin:/usr/bin:/usr/sbin])
if test x$BASH = "xno"; then
AC_MSG_ERROR([bash is required])
--
GitLab