diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-05-23 21:24:52 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-29 21:07:16 +0100 |
commit | 67e74b25d822c1d73045415f7dbbcb8ebe135d65 (patch) | |
tree | 0bcf0d3a363f31067944d38df681f253d4b15e21 /meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch | |
parent | 13b461c4f80dcd1543e48f815aceae05b0b71048 (diff) | |
download | poky-67e74b25d822c1d73045415f7dbbcb8ebe135d65.tar.gz |
btrfs-tools: upgrade 4.15.1 -> 4.16.1
Drop upstreamed patch.
Add a patch to correctly set LDFLAGS for one of the libraries and Python bindings.
Add dependencies to build Python bindings
(directly inheriting setuptools3 class does not work,
as the build is Makefile-managed) and a snippet to install them.
Also add a patch to allow specifying where they are installed
(to avoid hardcoded /usr/lib default).
(From OE-Core rev: a2b9834ec9b817e32772ddc27bc6b55fab33670c)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch')
-rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch new file mode 100644 index 0000000000..a8fcfc0f73 --- /dev/null +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From eecc48ecad359cd4fab650ce49cfe57e99d1859d Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Thu, 17 May 2018 12:21:31 +0300 | ||
4 | Subject: [PATCH] Add LDFLAGS when building libbtrfsutil.so and python | ||
5 | bindings. | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
9 | |||
10 | --- | ||
11 | Makefile | 4 ++-- | ||
12 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/Makefile b/Makefile | ||
15 | index 10f0e3b0..1697794c 100644 | ||
16 | --- a/Makefile | ||
17 | +++ b/Makefile | ||
18 | @@ -402,7 +402,7 @@ libbtrfsutil/%.o: libbtrfsutil/%.c | ||
19 | |||
20 | libbtrfsutil.so.$(libbtrfsutil_version): $(libbtrfsutil_objects) | ||
21 | @echo " [LD] $@" | ||
22 | - $(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) $(libbtrfsutil_objects) \ | ||
23 | + $(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) $(LDFLAGS) $(libbtrfsutil_objects) \ | ||
24 | -shared -Wl,-soname,libbtrfsutil.so.$(libbtrfsutil_major) -o $@ | ||
25 | |||
26 | libbtrfsutil.a: $(libbtrfsutil_objects) | ||
27 | @@ -417,7 +417,7 @@ ifeq ($(PYTHON_BINDINGS),1) | ||
28 | libbtrfsutil_python: libbtrfsutil.so.$(libbtrfsutil_major) libbtrfsutil.so libbtrfsutil/btrfsutil.h | ||
29 | @echo " [PY] libbtrfsutil" | ||
30 | $(Q)cd libbtrfsutil/python; \ | ||
31 | - CFLAGS= LDFLAGS= $(PYTHON) setup.py $(SETUP_PY_Q) build_ext -i build | ||
32 | + CFLAGS= $(PYTHON) setup.py $(SETUP_PY_Q) build_ext -i build | ||
33 | |||
34 | .PHONY: libbtrfsutil_python | ||
35 | endif | ||