f2fs-tools: drop patch in favour of CONFIGURE_VARS

Override the failing check in configure with CONFIGURE_VARS instead of
carrying a patch that's unlikely to be accepted by upstream.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Acked-by: John Crispin <john@phrozen.org>
(cherry picked from commit d87f27af54e7c122c8f320f7266dd5061bb47a8b)
This commit is contained in:
Stijn Tintel 2017-08-24 09:23:32 +03:00
parent bd29aa1ba1
commit 707a4b459d
2 changed files with 3 additions and 19 deletions

View File

@ -59,6 +59,9 @@ endef
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--without-selinux --without-selinux
CONFIGURE_VARS += \
ac_cv_file__git=no
define Package/libf2fs/install define Package/libf2fs/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) \ $(CP) \

View File

@ -1,19 +0,0 @@
--- a/configure.ac
+++ b/configure.ac
@@ -20,14 +20,9 @@ AC_DEFINE([F2FS_MINOR_VERSION], m4_bpats
[\([0-9]*\).\([0-9]*\)\(\w\|\W\)*], [\2]),
[Minor version for f2fs-tools])
-AC_CHECK_FILE(.git,
- AC_DEFINE([F2FS_TOOLS_DATE],
- "m4_bpatsubst(f2fs_tools_gitdate,
- [\([0-9-]*\)\(\w\|\W\)*], [\1])",
- [f2fs-tools date based on Git commits]),
- AC_DEFINE([F2FS_TOOLS_DATE],
+AC_DEFINE([F2FS_TOOLS_DATE],
"f2fs_tools_date",
- [f2fs-tools date based on Source releases]))
+ [f2fs-tools date based on Source releases])
AC_CONFIG_SRCDIR([config.h.in])
AC_CONFIG_HEADER([config.h])