aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch')
-rw-r--r--nixpkgs/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch30
1 files changed, 16 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch b/nixpkgs/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch
index 1503732240c..e01a97b0bc3 100644
--- a/nixpkgs/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch
+++ b/nixpkgs/pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch
@@ -1,25 +1,27 @@
---- f2fs-tools/configure.ac.orig 2018-11-29 05:05:57.154988687 +0300
-+++ f2fs-tools/configure.ac 2018-11-29 05:06:12.667316101 +0300
-@@ -20,14 +20,16 @@
+diff --git a/configure.ac b/configure.ac
+index 9b0e872..0108219 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,14 +20,16 @@ AC_DEFINE([F2FS_MINOR_VERSION], m4_bpatsubst(f2fs_tools_version,
[\([0-9]*\).\([0-9]*\)\(\w\|\W\)*], [\2]),
[Minor version for f2fs-tools])
--AC_CHECK_FILE(.git,
+-AS_IF([test -d .git],[
- AC_DEFINE([F2FS_TOOLS_DATE],
- "m4_bpatsubst(f2fs_tools_gitdate,
- [\([0-9-]*\)\(\w\|\W\)*], [\1])",
-- [f2fs-tools date based on Git commits]),
+- [f2fs-tools date based on Git commits])],[
- AC_DEFINE([F2FS_TOOLS_DATE],
- "f2fs_tools_date",
-- [f2fs-tools date based on Source releases]))
-+dnl AC_CHECK_FILE(.git,
-+dnl AC_DEFINE([F2FS_TOOLS_DATE],
-+dnl "m4_bpatsubst(f2fs_tools_gitdate,
-+dnl [\([0-9-]*\)\(\w\|\W\)*], [\1])",
-+dnl [f2fs-tools date based on Git commits]),
-+dnl AC_DEFINE([F2FS_TOOLS_DATE],
-+dnl "f2fs_tools_date",
-+dnl [f2fs-tools date based on Source releases]))
+- [f2fs-tools date based on Source releases])])
++dnl AS_IF([test -d .git],[
++dnl AC_DEFINE([F2FS_TOOLS_DATE],
++dnl "m4_bpatsubst(f2fs_tools_gitdate,
++dnl [\([0-9-]*\)\(\w\|\W\)*], [\1])",
++dnl [f2fs-tools date based on Git commits])],[
++dnl AC_DEFINE([F2FS_TOOLS_DATE],
++dnl "f2fs_tools_date",
++dnl [f2fs-tools date based on Source releases])])
+
+AC_DEFINE([F2FS_TOOLS_DATE], "f2fs_tools_date", [f2fs-tools date based on Source releases])