diff options
author | Joshua Watt <jpewhacker@gmail.com> | 2019-05-29 21:41:09 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-30 12:37:03 +0100 |
commit | 41bd3fee9db390d4d5e885aed007cb54c3d9bed5 (patch) | |
tree | ea3a4bdd12a4cdb37e1ddf24b814cc9f49eb67ed /meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-LDFLAGS-when-building-libbtrfsutil.so.patch | |
parent | 570938d845f2ce4208c6f004ab3b72e8be1ce40b (diff) | |
download | poky-41bd3fee9db390d4d5e885aed007cb54c3d9bed5.tar.gz |
btrfs-tools: Pass DEBUG_MAP_PREFIX flags to Python
The DEBUG_MAP_PREFIX flags need to be passed when building the Python
library to prevent these non-reproducible paths from being encoded into
the library. The patch that does this was accepted upstream and
supersedes part of a previous patch that passed LDFLAGS to the Python
library in favor of passing EXTRA_PYTHON_LDFLAGS, so the patch and
recipe has been updated to reflect this.
(From OE-Core rev: 04bb44c1b97c3183739e4836588a93dc34af8806)
Signed-off-by: Joshua Watt <JPEWhacker@gmail.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 | 19 |
1 files changed, 5 insertions, 14 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 index a8fcfc0f73..e23be32599 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From eecc48ecad359cd4fab650ce49cfe57e99d1859d Mon Sep 17 00:00:00 2001 | 1 | From c384fa875c5128009ac8b6ba11a54a6bd4de575a Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 17 May 2018 12:21:31 +0300 | 3 | Date: Thu, 17 May 2018 12:21:31 +0300 |
4 | Subject: [PATCH] Add LDFLAGS when building libbtrfsutil.so and python | 4 | Subject: [PATCH] Add LDFLAGS when building libbtrfsutil.so and python |
@@ -8,14 +8,14 @@ Upstream-Status: Pending | |||
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
9 | 9 | ||
10 | --- | 10 | --- |
11 | Makefile | 4 ++-- | 11 | Makefile | 2 +- |
12 | 1 file changed, 2 insertions(+), 2 deletions(-) | 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
13 | 13 | ||
14 | diff --git a/Makefile b/Makefile | 14 | diff --git a/Makefile b/Makefile |
15 | index 10f0e3b0..1697794c 100644 | 15 | index e25e256f..6df00186 100644 |
16 | --- a/Makefile | 16 | --- a/Makefile |
17 | +++ b/Makefile | 17 | +++ b/Makefile |
18 | @@ -402,7 +402,7 @@ libbtrfsutil/%.o: libbtrfsutil/%.c | 18 | @@ -424,7 +424,7 @@ libbtrfsutil/%.o: libbtrfsutil/%.c |
19 | 19 | ||
20 | libbtrfsutil.so.$(libbtrfsutil_version): $(libbtrfsutil_objects) | 20 | libbtrfsutil.so.$(libbtrfsutil_version): $(libbtrfsutil_objects) |
21 | @echo " [LD] $@" | 21 | @echo " [LD] $@" |
@@ -24,12 +24,3 @@ index 10f0e3b0..1697794c 100644 | |||
24 | -shared -Wl,-soname,libbtrfsutil.so.$(libbtrfsutil_major) -o $@ | 24 | -shared -Wl,-soname,libbtrfsutil.so.$(libbtrfsutil_major) -o $@ |
25 | 25 | ||
26 | libbtrfsutil.a: $(libbtrfsutil_objects) | 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 | ||