mirror of
https://git.yoctoproject.org/poky
synced 2026-03-05 14:59:41 +01:00
89c1220c40
Removed patches are in upstream. Rebase monitor-option.patch and no-msgfmt-check.patch Add support for python 3 probes (this necessitates the 0001-Do-not-let-configure-write-a-python-location-into-th.patch and the Add 0001-Install-python-modules-to-correct-library-dir.patch to install python modules to correct destination). Add perl to RDEPENDS to fix a QA warning about one of the installed files. (From OE-Core rev: e3bccfba499565ea13f154a11dadcab48ef5e0ab) 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>
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From 2ada22f05460223924efe54080cb4419e2b4c276 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
Date: Fri, 24 Feb 2017 17:53:02 +0200
|
|
Subject: [PATCH] Install python modules to correct library dir.
|
|
|
|
Upstream-Status: Inappropriate [oe-core specific]
|
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
---
|
|
python/Makefile.am | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/python/Makefile.am b/python/Makefile.am
|
|
index a254480f9..efe9f3c01 100644
|
|
--- a/python/Makefile.am
|
|
+++ b/python/Makefile.am
|
|
@@ -47,7 +47,7 @@ install-exec-local:
|
|
if HAVE_PYTHON2_PROBES
|
|
(cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON) setup.py build \
|
|
--build-base $(shell readlink -f $(builddir))/py2build \
|
|
- install --prefix $(DESTDIR)$(prefix) \
|
|
+ install --prefix $(DESTDIR)$(prefix) --install-lib=$(DESTDIR)${pythondir} \
|
|
--single-version-externally-managed \
|
|
--record $(shell readlink -f $(builddir))/py2build/install_files.txt \
|
|
--verbose)
|
|
@@ -55,7 +55,7 @@ endif
|
|
if HAVE_PYTHON3_PROBES
|
|
(cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON3) setup.py build \
|
|
--build-base $(shell readlink -f $(builddir))/py3build \
|
|
- install --prefix $(DESTDIR)$(prefix) \
|
|
+ install --prefix $(DESTDIR)$(prefix) --install-lib=$(DESTDIR)${python3dir} \
|
|
--single-version-externally-managed \
|
|
--record $(shell readlink -f $(builddir))/py3build/install_files.txt \
|
|
--verbose)
|
|
--
|
|
2.11.0
|
|
|