-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Prefer Python 3 by default to satisfy rpm build. Detect if the sed we are using supports --in-place or prefers -i '' at configure time. Signed-off-by: Ryan Moeller <ryan@ixsystems.com>
- Loading branch information
Ryan Moeller
committed
Jul 10, 2019
1 parent
137b90d
commit 7db8ab1
Showing
11 changed files
with
26 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
dnl # | ||
dnl # Set the flags used for sed in-place edits. | ||
dnl # | ||
AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_SED], [ | ||
ac_inplace="" | ||
AC_CACHE_CHECK([for sed --in-place], [ac_cv_path_SED], | ||
[AC_PATH_PROGS_FEATURE_CHECK([SED], [sed], | ||
[[tmpfile=$(mktemp) | ||
echo foo > $tmpfile | ||
$ac_path_SED --in-place 's#foo#bar#' $tmpfile \ | ||
&& ac_cv_path_SED=$ac_path_SED | ||
rm $tmpfile]], | ||
[ac_inplace="-i ''"])]) | ||
AS_IF([test "x$ac_inplace" = "x"], [ac_inplace="--in-place"]) | ||
AC_SUBST([ac_inplace]) | ||
]) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
#!/usr/bin/env python | ||
#!/usr/bin/env python3 | ||
|
||
# | ||
# This file and its contents are supplied under the terms of the | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
#!/usr/bin/env python | ||
#!/usr/bin/env python3 | ||
|
||
# | ||
# This file and its contents are supplied under the terms of the | ||
|