From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] btrfs-progs: adjust install-static patch to install headers under $(prefix)/include/btrfs
Date: Sun, 1 Jul 2018 20:34:08 +0200 [thread overview]
Message-ID: <20180701183408.7305-1-peter@korsgaard.com> (raw)
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>
---
.../0001-Makefile-install-static-library-and-headers-in-insta.patch | 4 ++--
1 file 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-%,%,$@)"
--
2.11.0
next reply other threads:[~2018-07-01 18:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-01 18:34 Peter Korsgaard [this message]
2018-07-02 21:07 ` [Buildroot] [PATCH] btrfs-progs: adjust install-static patch to install headers under $(prefix)/include/btrfs Thomas Petazzoni
2018-07-19 8:42 ` Thomas Petazzoni
2018-07-19 10:16 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180701183408.7305-1-peter@korsgaard.com \
--to=peter@korsgaard.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.