From 707a4b459d2a05f309691166c6f1fc4f6e58a6c8 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Thu, 24 Aug 2017 09:23:32 +0300 Subject: [PATCH] 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 Acked-by: John Crispin (cherry picked from commit d87f27af54e7c122c8f320f7266dd5061bb47a8b) --- package/utils/f2fs-tools/Makefile | 3 +++ .../f2fs-tools/patches/001-compile.patch | 19 ------------------- 2 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 package/utils/f2fs-tools/patches/001-compile.patch diff --git a/package/utils/f2fs-tools/Makefile b/package/utils/f2fs-tools/Makefile index 4ef751a5ff..5cef40ac23 100644 --- a/package/utils/f2fs-tools/Makefile +++ b/package/utils/f2fs-tools/Makefile @@ -59,6 +59,9 @@ endef CONFIGURE_ARGS += \ --without-selinux +CONFIGURE_VARS += \ + ac_cv_file__git=no + define Package/libf2fs/install $(INSTALL_DIR) $(1)/usr/lib $(CP) \ diff --git a/package/utils/f2fs-tools/patches/001-compile.patch b/package/utils/f2fs-tools/patches/001-compile.patch deleted file mode 100644 index 2ff6ee832d..0000000000 --- a/package/utils/f2fs-tools/patches/001-compile.patch +++ /dev/null @@ -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]) -- 2.25.1