diff options
Diffstat (limited to 'recipes-containers/criu/files/lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch')
| -rw-r--r-- | recipes-containers/criu/files/lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/recipes-containers/criu/files/lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch b/recipes-containers/criu/files/lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch index 8bda8c42..c2512a0e 100644 --- a/recipes-containers/criu/files/lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch +++ b/recipes-containers/criu/files/lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | From 2e0c5c66786016f6443da2c1ff15ad77f018ec9b Mon Sep 17 00:00:00 2001 | 1 | From 89f9b87904bd312b817ffaa7d83abfd5e84d723d Mon Sep 17 00:00:00 2001 |
| 2 | From: Mark Asselstine <mark.asselstine@windriver.com> | 2 | From: Mark Asselstine <mark.asselstine@windriver.com> |
| 3 | Date: Mon, 24 Apr 2017 16:12:05 -0400 | 3 | Date: Fri, 8 Sep 2017 15:40:49 -0400 |
| 4 | Subject: [PATCH] lib/Makefile: overwrite install-lib, to allow multiarch | 4 | Subject: [PATCH] lib/Makefile: overwrite install-lib, to allow multiarch |
| 5 | 5 | ||
| 6 | I am not sure why Yocto installs python modules in arch specific | 6 | I am not sure why Yocto installs python modules in arch specific |
| @@ -13,15 +13,15 @@ Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | |||
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 14 | 14 | ||
| 15 | diff --git a/lib/Makefile b/lib/Makefile | 15 | diff --git a/lib/Makefile b/lib/Makefile |
| 16 | index f1c0821..c714d12 100644 | 16 | index b1bb057..06f5c5d 100644 |
| 17 | --- a/lib/Makefile | 17 | --- a/lib/Makefile |
| 18 | +++ b/lib/Makefile | 18 | +++ b/lib/Makefile |
| 19 | @@ -56,7 +56,7 @@ install: lib-c lib-py ../crit/crit c/criu.pc.in | 19 | @@ -56,7 +56,7 @@ install: lib-c lib-py crit/crit lib/c/criu.pc.in |
| 20 | $(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)),' c/criu.pc.in > c/criu.pc | 20 | $(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)/criu/),' lib/c/criu.pc.in > lib/c/criu.pc |
| 21 | $(Q) install -m 644 c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig | 21 | $(Q) install -m 644 lib/c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig |
| 22 | $(E) " INSTALL " crit | 22 | $(E) " INSTALL " crit |
| 23 | - $(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --record $(CRIT_SETUP_FILES) | 23 | - $(Q) $(PYTHON_BIN) scripts/crit-setup.py install --prefix=$(DESTDIR)$(PREFIX) --record $(CRIT_SETUP_FILES) |
| 24 | + $(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --record $(CRIT_SETUP_FILES) --install-lib=$(INSTALL_LIB) | 24 | + $(Q) $(PYTHON_BIN) scripts/crit-setup.py install --prefix=$(DESTDIR)$(PREFIX) --record $(CRIT_SETUP_FILES) --install-lib=$(DESTDIR)$(INSTALL_LIB) |
| 25 | .PHONY: install | 25 | .PHONY: install |
| 26 | 26 | ||
| 27 | uninstall: | 27 | uninstall: |