mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-02 01:50:18 +00:00
Code Issues Projects Releases Wiki Activity

pcp: Fix build race

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2023-07-05 08:47:06 -07:00
parent 47b0452e7c
commit 2c38a555a1
2 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/pcp/pcp.inc
+1
View File
@@ -9,6 +9,7 @@ COMPATIBLE_HOST:libc-musl = "null"
SRC_URI = "https://performancecopilot.jfrog.io/artifactory/pcp-source-release/${BP}.src.tar.gz \
file://0001-configure-Limit-the-header-search-to-sysroot.patch \
file://0001-htop-Change-dependency-order-of-header-and-sourcefil.patch \
file://config.linux \
"
SRC_URI[sha256sum] = "dacf92ba195f1f2ea8f40bf0c455d2cd2456273a1e30dcc3ee5b5bfd099a99ee"
meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch
+36
View File
@@ -0,0 +1,36 @@
From c123980d6bf1bc2bf93ee0dd0d7f8fee3d4ddc96 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 5 Jul 2023 08:45:14 -0700
Subject: [PATCH] htop: Change dependency order of header and sourcefiles
Fixes build race
| pcp/Platform.h:29:10: fatal error: DiskIOMeter.h: No such file or directory
| 29 | #include "DiskIOMeter.h"
| | ^~~~~~~~~~~~~~~
| compilation terminated.
| make[3]: *** [<builtin>: pcp-htop.o] Error 1
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/pcp/htop/GNUmakefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pcp/htop/GNUmakefile b/src/pcp/htop/GNUmakefile
index 6b7c0c5..5153c63 100644
--- a/src/pcp/htop/GNUmakefile
+++ b/src/pcp/htop/GNUmakefile
@@ -186,8 +186,8 @@ CFGMETERS = $(patsubst %,pcp/meters/%,$(METERS))
CFGCOLUMNS = $(patsubst %,pcp/columns/%,$(COLUMNS))
CFGXFILES = $(CFGMETERS) $(CFGCOLUMNS)
-TOPXFILES = $(TOPCFILES) $(TOPHFILES) $(DOCFILES)
-SUBXFILES = $(SUBCFILES) $(SUBHFILES)
+TOPXFILES = $(TOPHFILES) $(TOPCFILES) $(DOCFILES)
+SUBXFILES = $(SUBHFILES) $(SUBCFILES)
CFILES = $(TOPCFILES) $(SUBCFILES)
HFILES = $(TOPHFILES) $(SUBHFILES)
LDIRT = $(TOPXFILES) $(SUBXFILES) $(CFGXFILES) \
--
2.41.0