Переглянути джерело

risc-v: Fix packagegroup dependencies for no clang

clang is not yet supported and when meta-clang is in
layermix things start to fail.

This patch patches by assuming the dependencies
and later adding them to bad recommendations so
they are dropped from runtime deps too

might not work with with dpkg backend

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Khem Raj 5 роки тому
батько
коміт
b7526a3e22

+ 13 - 0
conf/machine/freedom-u540.conf

@@ -46,3 +46,16 @@ WKS_FILE_DEPENDS ?= " \
 "
 
 WKS_FILE ?= "freedom-u540-bbl.wks"
+
+BAD_RECOMMENDATIONS += "\
+    libcxx-dev \
+    libcxx-staticdev \
+    compiler-rt-dev \
+    compiler-rt-staticdev \
+"
+ASSUME_PROVIDED += "\
+    libcxx-dev \
+    libcxx-staticdev \
+    compiler-rt-dev \
+    compiler-rt-staticdev \
+"

+ 1 - 0
conf/machine/include/arch-riscv.inc

@@ -5,3 +5,4 @@ DEFAULTTUNE ?= "riscv64"
 TUNE_ARCH = "${TUNE_ARCH_tune-${DEFAULTTUNE}}"
 TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}"
 TUNE_CCARGS .= ""
+

+ 14 - 0
conf/machine/qemuriscv64.conf

@@ -29,3 +29,17 @@ QB_DEFAULT_KERNEL = "bbl"
 QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@"
 QB_ROOTFS_OPT = "-drive file=@ROOTFS@,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
 QB_SLIRP_OPT = "-netdev user,id=net0,hostfwd=tcp::22222-:22"
+
+BAD_RECOMMENDATIONS += "\
+    libcxx-dev \
+    libcxx-staticdev \
+    compiler-rt-dev \
+    compiler-rt-staticdev \
+"
+
+ASSUME_PROVIDED += "\
+    libcxx-dev \
+    libcxx-staticdev \
+    compiler-rt-dev \
+    compiler-rt-staticdev \
+"

+ 13 - 0
conf/machine/riscv32.conf

@@ -28,3 +28,16 @@ USER_CLASSES_remove = "image-prelink"
 LINKER_HASH_STYLE = ""
 
 TCLIBC = "baremetal"
+
+BAD_RECOMMENDATIONS += "\
+    libcxx-dev \
+    libcxx-staticdev \
+    compiler-rt-dev \
+    compiler-rt-staticdev \
+"
+ASSUME_PROVIDED += "\
+    libcxx-dev \
+    libcxx-staticdev \
+    compiler-rt-dev \
+    compiler-rt-staticdev \
+"

+ 13 - 0
conf/machine/riscv64.conf

@@ -28,3 +28,16 @@ USER_CLASSES_remove = "image-prelink"
 LINKER_HASH_STYLE = ""
 
 TCLIBC = "baremetal"
+
+BAD_RECOMMENDATIONS += "\
+    libcxx-dev \
+    libcxx-staticdev \
+    compiler-rt-dev \
+    compiler-rt-staticdev \
+"
+ASSUME_PROVIDED += "\
+    libcxx-dev \
+    libcxx-staticdev \
+    compiler-rt-dev \
+    compiler-rt-staticdev \
+"