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

recipes,packagegroups: Remove libunwind deps for riscv

Browse Source 
since libunwind is not buildable, it results in glog not being buildable
and that results in ceres-solver and gperftools opencv needs glob to
eenable libeigen

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2020-04-22 22:22:48 -07:00
parent a29c0d794a
commit a0744673f0
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+8 -2
View File
@@ -129,8 +129,8 @@ RDEPENDS_packagegroup-meta-oe-devtools_remove_mips64el = "nodejs"
RDEPENDS_packagegroup-meta-oe-devtools_remove_powerpc = "android-tools breakpad uftrace lshw" RDEPENDS_packagegroup-meta-oe-devtools_remove_powerpc = "android-tools breakpad uftrace lshw"
RDEPENDS_packagegroup-meta-oe-devtools_remove_powerpc64 = "android-tools uftrace lshw" RDEPENDS_packagegroup-meta-oe-devtools_remove_powerpc64 = "android-tools uftrace lshw"
RDEPENDS_packagegroup-meta-oe-devtools_remove_powerpc64le = "android-tools uftrace lshw" RDEPENDS_packagegroup-meta-oe-devtools_remove_powerpc64le = "android-tools uftrace lshw"
RDEPENDS_packagegroup-meta-oe-devtools_remove_riscv64 = "nodejs uftrace lshw" RDEPENDS_packagegroup-meta-oe-devtools_remove_riscv64 = "breakpad ltrace nodejs uftrace lshw"
RDEPENDS_packagegroup-meta-oe-devtools_remove_riscv32 = "nodejs uftrace lshw" RDEPENDS_packagegroup-meta-oe-devtools_remove_riscv32 = "breakpad ltrace nodejs uftrace lshw"
RDEPENDS_packagegroup-meta-oe-extended ="\ RDEPENDS_packagegroup-meta-oe-extended ="\
byacc cfengine cfengine-masterfiles cmpi-bindings \ byacc cfengine cfengine-masterfiles cmpi-bindings \
@@ -203,6 +203,9 @@ RDEPENDS_packagegroup-meta-oe-kernel_remove_libc-musl = "crash minicoredumper"
RDEPENDS_packagegroup-meta-oe-kernel_remove_mips64 = "crash" RDEPENDS_packagegroup-meta-oe-kernel_remove_mips64 = "crash"
RDEPENDS_packagegroup-meta-oe-kernel_remove_mips64el = "crash" RDEPENDS_packagegroup-meta-oe-kernel_remove_mips64el = "crash"
RDEPENDS_packagegroup-meta-oe-kernel_remove_riscv64 = "crash oprofile"
RDEPENDS_packagegroup-meta-oe-kernel_remove_riscv32 = "crash oprofile"
RDEPENDS_packagegroup-meta-oe-multimedia ="\ RDEPENDS_packagegroup-meta-oe-multimedia ="\
alsa-oss audiofile cdrkit id3lib \ alsa-oss audiofile cdrkit id3lib \
a2jmidid jack libass libburn libcdio libcdio-paranoia \ a2jmidid jack libass libburn libcdio libcdio-paranoia \
@@ -304,6 +307,9 @@ RDEPENDS_packagegroup-meta-oe-ptest-packages = "\
libee-ptest \ libee-ptest \
poco-ptest \ poco-ptest \
" "
RDEPENDS_packagegroup-meta-oe-ptest-packages_remove_riscv64 = "oprofile-ptest"
RDEPENDS_packagegroup-meta-oe-ptest-packages_remove_riscv32 = "oprofile-ptest"
RDEPENDS_packagegroup-meta-oe-ptest-packages_append_x86 = "\ RDEPENDS_packagegroup-meta-oe-ptest-packages_append_x86 = "\
mcelog-ptest \ mcelog-ptest \
" "
meta-oe/recipes-support/glog/glog_0.3.5.bb
+5 -4
View File
@@ -6,8 +6,6 @@ HOMEPAGE = "https://github.com/google/glog"
LICENSE = "BSD-3-Clause" LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b" LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b"
DEPENDS = "libunwind"
SRC_URI = " \ SRC_URI = " \
git://github.com/google/glog.git;nobranch=1 \ git://github.com/google/glog.git;nobranch=1 \
file://0001-Rework-CMake-glog-VERSION-management.patch \ file://0001-Rework-CMake-glog-VERSION-management.patch \
@@ -21,6 +19,9 @@ S = "${WORKDIR}/git"
inherit cmake inherit cmake
RDEPENDS_${PN} += "libunwind" PACKAGECONFIG ?= "shared unwind"
PACKAGECONFIG_remove_riscv64 = "unwind"
PACKAGECONFIG_remove_riscv32 = "unwind"
EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" PACKAGECONFIG[unwind] = "-DWITH_UNWIND=ON,-DWITH_UNWIND=OFF,libunwind,libunwind"
PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,,"
meta-oe/recipes-support/gperftools/gperftools_2.7.90.bb
+3
View File
@@ -20,6 +20,7 @@ S = "${WORKDIR}/git"
# do_page_fault(): sending SIGSEGV to ls for invalid read access from 00000008 # do_page_fault(): sending SIGSEGV to ls for invalid read access from 00000008
# Segmentation fault (core dumped) # Segmentation fault (core dumped)
COMPATIBLE_HOST_mipsarch = "null" COMPATIBLE_HOST_mipsarch = "null"
# Disable thumb1 # Disable thumb1
# {standard input}: Assembler messages: # {standard input}: Assembler messages:
# {standard input}:434: Error: lo register required -- `ldr pc,[sp]' # {standard input}:434: Error: lo register required -- `ldr pc,[sp]'
@@ -29,6 +30,8 @@ ARM_INSTRUCTION_SET_toolchain-clang_arm = "arm"
PACKAGECONFIG ?= "libunwind static" PACKAGECONFIG ?= "libunwind static"
PACKAGECONFIG_remove_arm_libc-musl = "libunwind" PACKAGECONFIG_remove_arm_libc-musl = "libunwind"
PACKAGECONFIG_remove_riscv64 = "libunwind"
PACKAGECONFIG_remove_riscv32 = "libunwind"
PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind" PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind"
PACKAGECONFIG[static] = "--enable-static,--disable-static," PACKAGECONFIG[static] = "--enable-static,--disable-static,"