diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2020-12-03 10:36:28 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2020-12-03 10:36:28 +0000 |
| commit | f0d431f386d79d2654ca2a681c78e5edef7baebd (patch) | |
| tree | 9d1caeda9422c4e8b8793c03c91498390ed6fdbb /main/zfs/fix-check-for-sed--in-place-with-busybox-mktemp.patch | |
| parent | 6f459fc0bcc4f19e6a92644c4b4ad490f7cb7ff1 (diff) | |
| download | aports-f0d431f386d79d2654ca2a681c78e5edef7baebd.tar.gz aports-f0d431f386d79d2654ca2a681c78e5edef7baebd.tar.bz2 aports-f0d431f386d79d2654ca2a681c78e5edef7baebd.tar.xz | |
main/zfs: fix build with busybox mktemp
upstream report: https://github.com/openzfs/zfs/issues/11274
Diffstat (limited to 'main/zfs/fix-check-for-sed--in-place-with-busybox-mktemp.patch')
| -rw-r--r-- | main/zfs/fix-check-for-sed--in-place-with-busybox-mktemp.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/main/zfs/fix-check-for-sed--in-place-with-busybox-mktemp.patch b/main/zfs/fix-check-for-sed--in-place-with-busybox-mktemp.patch new file mode 100644 index 0000000000..c65aa93fb6 --- /dev/null +++ b/main/zfs/fix-check-for-sed--in-place-with-busybox-mktemp.patch @@ -0,0 +1,29 @@ +From cc5f362cbf927d5b7f902c3a582f11ceb3f789ad Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu, 3 Dec 2020 11:16:47 +0100 +Subject: [PATCH] Fix check for sed --in-place with busybox mktemp + +Fix build on Alpine Linux which uses busybox, and busybox mktemp +requires 6 trailing Xes. + +Fixes commit 4313a5b4c51e (Detect if sed supports --in-place) + +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> +Closes #11274 +--- + config/always-sed.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/always-sed.m4 b/config/always-sed.m4 +index 19633e118ae..3d7ae285ba1 100644 +--- a/config/always-sed.m4 ++++ b/config/always-sed.m4 +@@ -4,7 +4,7 @@ dnl # + AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_SED], [ + AC_REQUIRE([AC_PROG_SED])dnl + AC_CACHE_CHECK([for sed --in-place], [ac_cv_inplace], [ +- tmpfile=$(mktemp conftest.XXX) ++ tmpfile=$(mktemp conftest.XXXXXX) + echo foo >$tmpfile + AS_IF([$SED --in-place 's#foo#bar#' $tmpfile 2>/dev/null], + [ac_cv_inplace="--in-place"], |