diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2018-03-20 14:34:57 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2018-03-23 16:31:58 +0100 |
| commit | a81601589ef87c4ebb69517455f0fef8df7dd6ed (patch) | |
| tree | dade0a654332f7b5561e1454ac47952f4aa187b6 /package/xfsprogs/0005-xfs_scrub-fix-cross-compile-with-libunistring.patch | |
| parent | bb7a698001302249abf57762a0483fa2c3edb50a (diff) | |
| download | buildroot-a81601589ef87c4ebb69517455f0fef8df7dd6ed.tar.gz buildroot-a81601589ef87c4ebb69517455f0fef8df7dd6ed.zip | |
xfsprogs: fix build with libunistring
The latest xfsprogs bump to version 4.15.1 added an optional dependency
on libunistring. Make sure we build libunistring before xfsprogs.
xfsprogs also added -lunistring to its make dependency. This does not
work very well with cross compilation because make does not know about
sysroot. Add a patch to remove this dependency.
To make shared only link with libunistring work, we also need to extend
the -static-libtool-libs patch to cover xfs_scrub as well.
Fixes:
http://autobuild.buildroot.net/results/66e/66e425b00a06f928be0951ac4196190fe88b0f62/
http://autobuild.buildroot.net/results/1cd/1cde87d1daf3c6009220ff47512794cef6a2938f/
http://autobuild.buildroot.net/results/8ba/8ba4e94cfbb8a5cbb166423a671bdbcdf535f86b/
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/xfsprogs/0005-xfs_scrub-fix-cross-compile-with-libunistring.patch')
| -rw-r--r-- | package/xfsprogs/0005-xfs_scrub-fix-cross-compile-with-libunistring.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/package/xfsprogs/0005-xfs_scrub-fix-cross-compile-with-libunistring.patch b/package/xfsprogs/0005-xfs_scrub-fix-cross-compile-with-libunistring.patch new file mode 100644 index 0000000000..dfb66c6630 --- /dev/null +++ b/package/xfsprogs/0005-xfs_scrub-fix-cross-compile-with-libunistring.patch @@ -0,0 +1,37 @@ +From 45d9ba0f01cceb75f72d157a9e4d9aaeb753a9c4 Mon Sep 17 00:00:00 2001 +From: Baruch Siach <baruch@tkos.co.il> +Date: Tue, 20 Mar 2018 14:13:28 +0200 +Subject: [PATCH] xfs_scrub: fix cross compile with libunistring + +Commit 4bbed4ecc2a (xfs_scrub: warn about normalized Unicode name collisions) +added -lunistring to the list of the xfs_scrub dependencies. When cross +compiling make fails to find the library on the target sysroot: + +make[3]: *** No rule to make target `-lunistring', needed by `xfs_scrub'. Stop. + +Remove -lunistring from make dependencies of xfs_scrub to fix that. + +Cc: Darrick J. Wong <darrick.wong@oracle.com> +Signed-off-by: Baruch Siach <baruch@tkos.co.il> +--- +Upstream status: https://patchwork.kernel.org/patch/10296957/ + + scrub/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scrub/Makefile b/scrub/Makefile +index 949f6fd8ba94..979603f524ff 100644 +--- a/scrub/Makefile ++++ b/scrub/Makefile +@@ -69,7 +69,7 @@ vfs.c \ + xfs_scrub.c + + LLDLIBS += $(LIBHANDLE) $(LIBFROG) $(LIBPTHREAD) $(LIBUNISTRING) $(LIBRT) +-LTDEPENDENCIES += $(LIBHANDLE) $(LIBFROG) $(LIBUNISTRING) $(LIBRT) ++LTDEPENDENCIES += $(LIBHANDLE) $(LIBFROG) $(LIBRT) + LLDFLAGS = -static-libtool-libs + + ifeq ($(HAVE_MALLINFO),yes) +-- +2.16.2 + |
