diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2017-08-24 09:23:32 +0300 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2017-09-03 10:14:09 +0300 |
| commit | 707a4b459d2a05f309691166c6f1fc4f6e58a6c8 (patch) | |
| tree | 25e3f678f52f3b9a17611095c4fdf5c49a4254e3 | |
| parent | bd29aa1ba1f2c72c3ad9f6a1d3379e04991c1537 (diff) | |
| download | upstream-707a4b459d2a05f309691166c6f1fc4f6e58a6c8.tar.gz upstream-707a4b459d2a05f309691166c6f1fc4f6e58a6c8.tar.bz2 upstream-707a4b459d2a05f309691166c6f1fc4f6e58a6c8.zip | |
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)
| -rw-r--r-- | package/utils/f2fs-tools/Makefile | 3 | ||||
| -rw-r--r-- | package/utils/f2fs-tools/patches/001-compile.patch | 19 |
2 files changed, 3 insertions, 19 deletions
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]) |