Files
poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch
Alexander Kanavin 67e74b25d8 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>
2018-05-29 21:07:16 +01:00

36 lines
1.2 KiB
Diff

From eecc48ecad359cd4fab650ce49cfe57e99d1859d Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 17 May 2018 12:21:31 +0300
Subject: [PATCH] Add LDFLAGS when building libbtrfsutil.so and python
bindings.
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 10f0e3b0..1697794c 100644
--- a/Makefile
+++ b/Makefile
@@ -402,7 +402,7 @@ libbtrfsutil/%.o: libbtrfsutil/%.c
libbtrfsutil.so.$(libbtrfsutil_version): $(libbtrfsutil_objects)
@echo " [LD] $@"
- $(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) $(libbtrfsutil_objects) \
+ $(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) $(LDFLAGS) $(libbtrfsutil_objects) \
-shared -Wl,-soname,libbtrfsutil.so.$(libbtrfsutil_major) -o $@
libbtrfsutil.a: $(libbtrfsutil_objects)
@@ -417,7 +417,7 @@ ifeq ($(PYTHON_BINDINGS),1)
libbtrfsutil_python: libbtrfsutil.so.$(libbtrfsutil_major) libbtrfsutil.so libbtrfsutil/btrfsutil.h
@echo " [PY] libbtrfsutil"
$(Q)cd libbtrfsutil/python; \
- CFLAGS= LDFLAGS= $(PYTHON) setup.py $(SETUP_PY_Q) build_ext -i build
+ CFLAGS= $(PYTHON) setup.py $(SETUP_PY_Q) build_ext -i build
.PHONY: libbtrfsutil_python
endif