summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2021-01-19 01:23:45 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-20 00:45:05 +0000
commit5875637ed24f5186bc82763a6fd88b42a52d5ec8 (patch)
tree4e606c77433ab7109b70a7b6ab1fba35e67f8638 /meta/recipes-devtools
parentf13a95e17e38e519d9afb3834fcb9c9472132d21 (diff)
downloadpoky-5875637ed24f5186bc82763a6fd88b42a52d5ec8.tar.gz
apt: Fix do_compile error when enable ccache
Fixed: apt-pkg/libapt-pkg.so.5.0.2: undefined reference to `ZSTD_endStream' collect2: error: ld returned 1 exit status This is because ccache-native depends on zstd-native which makes apt wronly find it. Disable zstd for apt to fix the problem. (From OE-Core rev: 0aa7d612b8b7e5f14b4ed38f2a32b3f7eefca31c) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/apt/apt_1.8.2.1.bb6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-devtools/apt/apt_1.8.2.1.bb b/meta/recipes-devtools/apt/apt_1.8.2.1.bb
index 9fc6e54a29..0e10f9ba1d 100644
--- a/meta/recipes-devtools/apt/apt_1.8.2.1.bb
+++ b/meta/recipes-devtools/apt/apt_1.8.2.1.bb
@@ -40,7 +40,11 @@ BBCLASSEXTEND = "native nativesdk"
40 40
41DEPENDS += "virtual/libiconv virtual/libintl db gnutls lz4 zlib bzip2 xz" 41DEPENDS += "virtual/libiconv virtual/libintl db gnutls lz4 zlib bzip2 xz"
42 42
43EXTRA_OECMAKE_append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False -DUSE_NLS=False -DDPKG_DATADIR=${datadir}/dpkg -DTRIEHASH_EXECUTABLE=${WORKDIR}/triehash" 43EXTRA_OECMAKE_append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \
44 -DUSE_NLS=False -DDPKG_DATADIR=${datadir}/dpkg \
45 -DTRIEHASH_EXECUTABLE=${WORKDIR}/triehash \
46 -DCMAKE_DISABLE_FIND_PACKAGE_Zstd=True \
47"
44 48
45do_configure_prepend () { 49do_configure_prepend () {
46 echo "set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH )" >> ${WORKDIR}/toolchain.cmake 50 echo "set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH )" >> ${WORKDIR}/toolchain.cmake