diff options
Diffstat (limited to 'recipes-security/selinux/libselinux/0001-Makefile-fix-python-modules-install-path-for-multili.patch')
-rw-r--r-- | recipes-security/selinux/libselinux/0001-Makefile-fix-python-modules-install-path-for-multili.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-security/selinux/libselinux/0001-Makefile-fix-python-modules-install-path-for-multili.patch b/recipes-security/selinux/libselinux/0001-Makefile-fix-python-modules-install-path-for-multili.patch index f0fee23..9dfd8d4 100644 --- a/recipes-security/selinux/libselinux/0001-Makefile-fix-python-modules-install-path-for-multili.patch +++ b/recipes-security/selinux/libselinux/0001-Makefile-fix-python-modules-install-path-for-multili.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 930514c1b93335ccf6d70adf46ca7e3f8183603d Mon Sep 17 00:00:00 2001 | 1 | From 41540f5c4e3552a2806097613f016d1a2fd4754a Mon Sep 17 00:00:00 2001 |
2 | From: Yi Zhao <yi.zhao@windriver.com> | 2 | From: Yi Zhao <yi.zhao@windriver.com> |
3 | Date: Mon, 13 Apr 2020 12:44:23 +0800 | 3 | Date: Mon, 13 Apr 2020 12:44:23 +0800 |
4 | Subject: [PATCH] Makefile: fix python modules install path for multilib | 4 | Subject: [PATCH] Makefile: fix python modules install path for multilib |
@@ -11,18 +11,18 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | |||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
12 | 12 | ||
13 | diff --git a/src/Makefile b/src/Makefile | 13 | diff --git a/src/Makefile b/src/Makefile |
14 | index b0ce2c8..a384a10 100644 | 14 | index 190016e..dcdeb10 100644 |
15 | --- a/src/Makefile | 15 | --- a/src/Makefile |
16 | +++ b/src/Makefile | 16 | +++ b/src/Makefile |
17 | @@ -173,7 +173,7 @@ install: all | 17 | @@ -174,7 +174,7 @@ install: all |
18 | ln -sf --relative $(DESTDIR)$(SHLIBDIR)/$(LIBSO) $(DESTDIR)$(LIBDIR)/$(TARGET) | 18 | ln -sf --relative $(DESTDIR)$(SHLIBDIR)/$(LIBSO) $(DESTDIR)$(LIBDIR)/$(TARGET) |
19 | 19 | ||
20 | install-pywrap: pywrap | 20 | install-pywrap: pywrap |
21 | - $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` | 21 | - $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` $(PYTHON_SETUP_ARGS) |
22 | + $(PYTHON) setup.py install --prefix=$(PREFIX) --root=$(DESTDIR) --install-lib=$(PYTHONLIBDIR) | 22 | + $(PYTHON) setup.py install --prefix=$(PREFIX) --root=$(DESTDIR) --install-lib=$(PYTHONLIBDIR) $(PYTHON_SETUP_ARGS) |
23 | install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py | 23 | install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py |
24 | ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) | 24 | ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) |
25 | 25 | ||
26 | -- | 26 | -- |
27 | 2.7.4 | 27 | 2.17.1 |
28 | 28 | ||