mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-28 03:49:38 +03:00
5ca349f95d
The test added in commit
4313a5b4c5 ("Detect if sed supports --in-place")
doesn't work at least on my system (autoconfig-2.69).
The issue is that SED has already been found and cached before this
function is evaluated, with the result that the test is completely
skipped.
...
checking for a sed that does not truncate output... /usr/bin/sed
...
checking for sed --in-place... (cached) /usr/bin/sed
The first test is executed by libtool.m4. This looks to have been around
in libtool for at least 15 years or so, not sure why this was not
encountered at the time of the original commit.
Fix this by caching the value of the ac_inplace flag rather than the
path to SED. Also use $SED and add AC_REQUIRE to ensure that we use the
sed that was located by the standard configure test.
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Closes #10493
16 lines
544 B
Makefile
16 lines
544 B
Makefile
pkgdatadir = $(datadir)/@PACKAGE@/test-runner/bin
|
|
dist_pkgdata_SCRIPTS = \
|
|
test-runner.py \
|
|
zts-report.py
|
|
#
|
|
# These scripts are compatible with both Python 2.6 and 3.4. As such the
|
|
# python 3 shebang can be replaced at install time when targeting a python
|
|
# 2 system. This allows us to maintain a single version of the source.
|
|
#
|
|
if USING_PYTHON_2
|
|
install-data-hook:
|
|
$(SED) ${ac_inplace} -e 's|^#!/usr/bin/env python3|#!/usr/bin/env python2|' \
|
|
$(DESTDIR)$(pkgdatadir)/test-runner.py \
|
|
$(DESTDIR)$(pkgdatadir)/zts-report.py
|
|
endif
|