| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | From 0731eefd389e01419f78a115e1363ed0c28cfd3a Mon Sep 17 00:00:00 2001 |
| 2 | From: "Yong, Jonathan" <jonathan.yong@intel.com> |
| 3 | Date: Thu, 30 Mar 2017 08:03:37 +0000 |
| 4 | Subject: [PATCH] Fix mkfs out of tree builds |
| 5 | |
| 6 | Libraries are built in builddir, not srcdir, fix Makefile.am |
| 7 | accordingly. |
| 8 | |
| 9 | Signed-off-by: Yong, Jonathan <jonathan.yong@intel.com> |
| 10 | Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> |
| 11 | |
| 12 | The patch was imported from the f2fs-tools repo |
| 13 | (git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git) |
| 14 | commit ID 0731eefd389e01419f78a115e1363ed0c28cfd3a. |
| 15 | |
| 16 | Upstream-Status: Accepted, expected to be included in 1.9.0. |
| 17 | |
| 18 | Signed-off-by: Yong, Jonathan <jonathan.yong@intel.com> |
| 19 | |
| 20 | --- |
| 21 | mkfs/Makefile.am | 2 +- |
| 22 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 23 | |
| 24 | diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am |
| 25 | index 162a0cf..0ea8b49 100644 |
| 26 | --- a/mkfs/Makefile.am |
| 27 | +++ b/mkfs/Makefile.am |
| 28 | @@ -10,5 +10,5 @@ lib_LTLIBRARIES = libf2fs_format.la |
| 29 | libf2fs_format_la_SOURCES = f2fs_format_main.c f2fs_format.c f2fs_format_utils.c |
| 30 | libf2fs_format_la_CFLAGS = -DWITH_BLKDISCARD |
| 31 | libf2fs_format_la_CPPFLAGS = -I$(top_srcdir)/include |
| 32 | -libf2fs_format_la_LDFLAGS = -luuid -L$(top_srcdir)/lib -lf2fs \ |
| 33 | +libf2fs_format_la_LDFLAGS = -luuid -L$(top_builddir)/lib -lf2fs \ |
| 34 | -version-info $(FMT_CURRENT):$(FMT_REVISION):$(FMT_AGE) |
| 35 | -- |
| 36 | 2.10.2 |
| 37 | |