diff options
author | Peter Korsgaard <peter@korsgaard.com> | 2018-07-01 20:34:08 +0200 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2018-07-02 23:06:58 +0200 |
commit | 83b40e1ea2e3ce046d7db442b01c3bfe52886ce8 (patch) | |
tree | 0ed406e5cd1b9b2298514ca79f66e5ff72621b39 /package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch | |
parent | 9086de8e15d98abda64850c52b66756646e0c2f4 (diff) | |
download | buildroot-83b40e1ea2e3ce046d7db442b01c3bfe52886ce8.tar.gz buildroot-83b40e1ea2e3ce046d7db442b01c3bfe52886ce8.zip |
btrfs-progs: adjust install-static patch to install headers under $(prefix)/include/btrfs
Fixes:
http://autobuild.buildroot.net/results/15cc6523a42bf66508b2b37fd1fcb74625561ec2/
btrfs-progs 'make install' installs headers under $(prefix)/include/btrfs,
but our patch to also install headers for 'install-static' installed
directly into $(prefix)/include, confusing other packages as btrfs-progs
headers have very common names such as version, sizes.h, list.h, ioctl.h, ..
Fix it by adjusting the patch to also install under $(prefix)/include/btrfs.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch')
-rw-r--r-- | package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch b/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch index 1cdedfd984..de2db2f16f 100644 --- a/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch +++ b/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch @@ -41,8 +41,8 @@ index 67fbc48..d9e34be 100644 $(LN_S) -f btrfs.static $(DESTDIR)$(bindir)/btrfsck.static + $(INSTALL) -m755 -d $(DESTDIR)$(libdir) + $(INSTALL) $(libs_static) $(DESTDIR)$(libdir) -+ $(INSTALL) -m755 -d $(DESTDIR)$(incdir) -+ $(INSTALL) -m644 $(libbtrfs_headers) $(DESTDIR)$(incdir) ++ $(INSTALL) -m755 -d $(DESTDIR)$(incdir)/btrfs ++ $(INSTALL) -m644 $(libbtrfs_headers) $(DESTDIR)$(incdir)/btrfs $(INSTALLDIRS): @echo "Making install in $(patsubst install-%,%,$@)" |