summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch26
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools/0003-btrfs-progs-Pass-CFLAGS-and-LDFLAGS-to-Python.patch43
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools_5.1.1.bb (renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.1.bb)4
3 files changed, 1 insertions, 72 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
deleted file mode 100644
index e23be32599..0000000000
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From c384fa875c5128009ac8b6ba11a54a6bd4de575a Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 17 May 2018 12:21:31 +0300
4Subject: [PATCH] Add LDFLAGS when building libbtrfsutil.so and python
5 bindings.
6
7Upstream-Status: Pending
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9
10---
11 Makefile | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/Makefile b/Makefile
15index e25e256f..6df00186 100644
16--- a/Makefile
17+++ b/Makefile
18@@ -424,7 +424,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)
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0003-btrfs-progs-Pass-CFLAGS-and-LDFLAGS-to-Python.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0003-btrfs-progs-Pass-CFLAGS-and-LDFLAGS-to-Python.patch
deleted file mode 100644
index f69507164c..0000000000
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0003-btrfs-progs-Pass-CFLAGS-and-LDFLAGS-to-Python.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From 730fe2ee2fb9e08cbe885f370afe83fecb18d048 Mon Sep 17 00:00:00 2001
2From: Joshua Watt <JPEWhacker@gmail.com>
3Date: Sun, 26 May 2019 21:26:04 -0500
4Subject: [PATCH] btrfs-progs: Pass CFLAGS and LDFLAGS to Python
5
6Adds Make variables EXTRA_PYTHON_CFLAGS and EXTRA_PYTHON_LDFLAGS which
7can be used to pass CFLAGS and LDFLAGS respectively when building the
8Python library.
9
10This is required to support reproducible builds, as there are often
11compiler and linker flags that must be passed in order to generate
12reproducible output (e.g. -fdebug-prefix-map)
13
14Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
15Upstream-Status: Accepted [https://github.com/kdave/btrfs-progs/pull/176]
16---
17 Makefile | 6 +++++-
18 1 file changed, 5 insertions(+), 1 deletion(-)
19
20diff --git a/Makefile b/Makefile
21index 505bd9c1..814767a8 100644
22--- a/Makefile
23+++ b/Makefile
24@@ -24,6 +24,10 @@
25 # DEBUG_CFLAGS additional compiler flags for debugging build
26 # EXTRA_CFLAGS additional compiler flags
27 # EXTRA_LDFLAGS additional linker flags
28+# EXTRA_PYTHON_CFLAGS additional compiler flags to pass when building Python
29+# library
30+# EXTRA_PYTHON_LDFLAGS additional linker flags to pass when building Python
31+# library
32 #
33 # Testing-specific options (see also tests/README.md):
34 # TEST=GLOB run test(s) from directories matching GLOB
35@@ -439,7 +443,7 @@ ifeq ($(PYTHON_BINDINGS),1)
36 libbtrfsutil_python: libbtrfsutil.so.$(libbtrfsutil_major) libbtrfsutil.so libbtrfsutil/btrfsutil.h
37 @echo " [PY] libbtrfsutil"
38 $(Q)cd libbtrfsutil/python; \
39- CFLAGS= LDFLAGS= $(PYTHON) setup.py $(SETUP_PY_Q) build_ext -i build
40+ CFLAGS="$(EXTRA_PYTHON_CFLAGS)" LDFLAGS="$(EXTRA_PYTHON_LDFLAGS)" $(PYTHON) setup.py $(SETUP_PY_Q) build_ext -i build
41
42 .PHONY: libbtrfsutil_python
43 endif
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.1.1.bb
index 89cc1bfe20..2cd99706b4 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.1.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.1.1.bb
@@ -14,11 +14,9 @@ DEPENDS = "util-linux attr e2fsprogs lzo acl python3-setuptools-native"
14DEPENDS_append_class-target = " udev" 14DEPENDS_append_class-target = " udev"
15RDEPENDS_${PN} = "libgcc" 15RDEPENDS_${PN} = "libgcc"
16 16
17SRCREV = "43013422dbce4bcc9ed77cfe65b294caa0985ec8" 17SRCREV = "781e36a784faa58a4f0515eef124af860d59e2c0"
18SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ 18SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
19 file://0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch \
20 file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ 19 file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
21 file://0003-btrfs-progs-Pass-CFLAGS-and-LDFLAGS-to-Python.patch \
22 " 20 "
23 21
24inherit autotools-brokensep pkgconfig manpages distutils3-base 22inherit autotools-brokensep pkgconfig manpages distutils3-base