diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2021-03-31 18:46:08 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-04-05 15:29:02 +0100 |
commit | 8d00b494a2d3169db91bb3f54a3541a99051cfb7 (patch) | |
tree | a2a16a7c901051e28a01e5b462a1e13b765e66f2 /meta/recipes-devtools | |
parent | 4718aa32fa3bf823cd8646bb4eeae7f2d99a5f57 (diff) | |
download | poky-8d00b494a2d3169db91bb3f54a3541a99051cfb7.tar.gz |
apt: Fix do_compile error when enable ccache
When apt was upgraded, the '-DCMAKE_DISABLE_FIND_PACKAGE_Zstd=True'
was dropped. However, it was there to fix do_compile error when ccache is
enabled. See details in the following commit.
"""
commit 0aa7d612b8b7e5f14b4ed38f2a32b3f7eefca31c
Author: Robert Yang <liezhi.yang@windriver.com>
Date: Tue Jan 19 01:23:45 2021 -0800
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.
"""
Now we are meeting do_compile failure again when enabling ccache, so add it
back to solve the problem.
(From OE-Core rev: f8aa80a8fc777464f20e864b53af0582487d0387)
Signed-off-by: Chen Qi <Qi.Chen@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_2.2.2.bb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-devtools/apt/apt_2.2.2.bb b/meta/recipes-devtools/apt/apt_2.2.2.bb index d1aa5de8df..7d1bce558d 100644 --- a/meta/recipes-devtools/apt/apt_2.2.2.bb +++ b/meta/recipes-devtools/apt/apt_2.2.2.bb | |||
@@ -44,6 +44,7 @@ DEPENDS += "db gnutls lz4 zlib bzip2 xz libgcrypt xxhash" | |||
44 | EXTRA_OECMAKE_append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \ | 44 | EXTRA_OECMAKE_append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \ |
45 | -DDPKG_DATADIR=${datadir}/dpkg \ | 45 | -DDPKG_DATADIR=${datadir}/dpkg \ |
46 | -DTRIEHASH_EXECUTABLE=${WORKDIR}/triehash \ | 46 | -DTRIEHASH_EXECUTABLE=${WORKDIR}/triehash \ |
47 | -DCMAKE_DISABLE_FIND_PACKAGE_ZSTD=True \ | ||
47 | -DWITH_TESTS=False \ | 48 | -DWITH_TESTS=False \ |
48 | " | 49 | " |
49 | 50 | ||