summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch')
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch15
1 files changed, 7 insertions, 8 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch b/meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch
index fd9b6ea7ff..7bbe5c216e 100644
--- a/meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch
+++ b/meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch
@@ -1,6 +1,6 @@
1From dd1fdc841d069dbd4e284f430a88af79de951124 Mon Sep 17 00:00:00 2001 1From 30660997d220602202d8dc7264e49095a1581947 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com> 2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Thu, 26 Sep 2019 17:54:00 +0800 3Date: Tue, 20 Feb 2024 12:19:06 +0000
4Subject: [PATCH] python-lttngust/Makefile.am: Add --install-lib to setup.py 4Subject: [PATCH] python-lttngust/Makefile.am: Add --install-lib to setup.py
5 5
6Otherwise it may install to /usr/lib, but should be /usr/lib64 when cross 6Otherwise it may install to /usr/lib, but should be /usr/lib64 when cross
@@ -9,21 +9,20 @@ building.
9Upstream-Status: Submitted [https://github.com/lttng/lttng-ust/pull/59] 9Upstream-Status: Submitted [https://github.com/lttng/lttng-ust/pull/59]
10 10
11Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 11Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
12
13--- 12---
14 src/python-lttngust/Makefile.am | 2 +- 13 src/python-lttngust/Makefile.am | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
16 15
17diff --git a/src/python-lttngust/Makefile.am b/src/python-lttngust/Makefile.am 16diff --git a/src/python-lttngust/Makefile.am b/src/python-lttngust/Makefile.am
18index f95482d..f76d95b 100644 17index d53e21d..283901e 100644
19--- a/src/python-lttngust/Makefile.am 18--- a/src/python-lttngust/Makefile.am
20+++ b/src/python-lttngust/Makefile.am 19+++ b/src/python-lttngust/Makefile.am
21@@ -32,7 +32,7 @@ install-exec-local: build-python-bindings.stamp 20@@ -45,7 +45,7 @@ install-exec-local: build-python-bindings.stamp
22 if [ "$(DESTDIR)" != "" ]; then \ 21 if [ "$(DESTDIR)" != "" ]; then \
23 opts="$$opts --root=$(DESTDIR)"; \ 22 opts="$$opts --root=$(DESTDIR)"; \
24 fi; \ 23 fi; \
25- $(PYTHON) $(builddir)/setup.py install $$opts; 24- $(PYTHON) $(builddir)/setup.py install $(PY_INSTALL_OPTS) $$opts;
26+ $(PYTHON) $(builddir)/setup.py install $$opts --install-lib=$(pythondir); 25+ $(PYTHON) $(builddir)/setup.py install $(PY_INSTALL_OPTS) $$opts --install-lib=$(pythondir);
27 26
28 clean-local: 27 clean-local:
29 rm -rf $(builddir)/build 28 rm -rf $(builddir)/build