mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-08-15 21:30:46 +00:00
86407337b9
Added the generic library path used by multilib code Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> Tested-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
90 lines
4.2 KiB
Diff
90 lines
4.2 KiB
Diff
From 50cea8fd3c07ab27da6edce865a49339f16f3b57 Mon Sep 17 00:00:00 2001
|
|
From: Naveen Saini <naveen.kumar.saini@intel.com>
|
|
Date: Tue, 18 Jun 2019 17:10:15 +0800
|
|
Subject: [PATCH] Makefile: fix multilib build failure
|
|
|
|
Upstream-Status: Inappropriate [oe specific]
|
|
|
|
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
|
|
---
|
|
Makefile | 50 +++++++++++++++++++++++++++-----------------------
|
|
1 file changed, 27 insertions(+), 23 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 8455415..4aa0786 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1,30 +1,34 @@
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
PREFIX ?= /usr
|
|
DESTDIR ?=
|
|
+BASELIB ?=
|
|
|
|
all:
|
|
@echo "Nothing to build"
|
|
|
|
+clean:
|
|
+ @echo "Nothing to clean"
|
|
+
|
|
install : uninstall
|
|
- install -d $(DESTDIR)$(PREFIX)/lib/pm-graph
|
|
- install sleepgraph.py $(DESTDIR)$(PREFIX)/lib/pm-graph
|
|
- install bootgraph.py $(DESTDIR)$(PREFIX)/lib/pm-graph
|
|
- install -d $(DESTDIR)$(PREFIX)/lib/pm-graph/config
|
|
- install -m 644 config/cgskip.txt $(DESTDIR)$(PREFIX)/lib/pm-graph/config
|
|
- install -m 644 config/freeze-callgraph.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
|
|
- install -m 644 config/freeze.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
|
|
- install -m 644 config/freeze-dev.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
|
|
- install -m 644 config/standby-callgraph.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
|
|
- install -m 644 config/standby.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
|
|
- install -m 644 config/standby-dev.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
|
|
- install -m 644 config/suspend-callgraph.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
|
|
- install -m 644 config/suspend.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
|
|
- install -m 644 config/suspend-dev.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
|
|
- install -m 644 config/suspend-x2-proc.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
|
|
+ install -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph
|
|
+ install sleepgraph.py $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph
|
|
+ install bootgraph.py $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph
|
|
+ install -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
|
|
+ install -m 644 config/cgskip.txt $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
|
|
+ install -m 644 config/freeze-callgraph.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
|
|
+ install -m 644 config/freeze.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
|
|
+ install -m 644 config/freeze-dev.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
|
|
+ install -m 644 config/standby-callgraph.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
|
|
+ install -m 644 config/standby.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
|
|
+ install -m 644 config/standby-dev.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
|
|
+ install -m 644 config/suspend-callgraph.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
|
|
+ install -m 644 config/suspend.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
|
|
+ install -m 644 config/suspend-dev.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
|
|
+ install -m 644 config/suspend-x2-proc.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
|
|
|
|
install -d $(DESTDIR)$(PREFIX)/bin
|
|
- ln -s ../lib/pm-graph/bootgraph.py $(DESTDIR)$(PREFIX)/bin/bootgraph
|
|
- ln -s ../lib/pm-graph/sleepgraph.py $(DESTDIR)$(PREFIX)/bin/sleepgraph
|
|
+ ln -s ../$(BASELIB)/pm-graph/bootgraph.py $(DESTDIR)$(PREFIX)/bin/bootgraph
|
|
+ ln -s ../$(BASELIB)/pm-graph/sleepgraph.py $(DESTDIR)$(PREFIX)/bin/sleepgraph
|
|
|
|
install -d $(DESTDIR)$(PREFIX)/share/man/man8
|
|
install bootgraph.8 $(DESTDIR)$(PREFIX)/share/man/man8
|
|
@@ -37,11 +41,11 @@ uninstall :
|
|
rm -f $(DESTDIR)$(PREFIX)/bin/bootgraph
|
|
rm -f $(DESTDIR)$(PREFIX)/bin/sleepgraph
|
|
|
|
- rm -f $(DESTDIR)$(PREFIX)/lib/pm-graph/config/*
|
|
- if [ -d $(DESTDIR)$(PREFIX)/lib/pm-graph/config ] ; then \
|
|
- rmdir $(DESTDIR)$(PREFIX)/lib/pm-graph/config; \
|
|
+ rm -f $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config/*
|
|
+ if [ -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ] ; then \
|
|
+ rmdir $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config; \
|
|
fi;
|
|
- rm -f $(DESTDIR)$(PREFIX)/lib/pm-graph/*
|
|
- if [ -d $(DESTDIR)$(PREFIX)/lib/pm-graph ] ; then \
|
|
- rmdir $(DESTDIR)$(PREFIX)/lib/pm-graph; \
|
|
+ rm -f $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/*
|
|
+ if [ -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph ] ; then \
|
|
+ rmdir $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph; \
|
|
fi;
|
|
--
|
|
2.17.1
|
|
|