diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-03-20 14:49:56 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-23 22:51:25 +0000 |
commit | 9d00a01831f22d93d4ac9a7e7151758e428b9750 (patch) | |
tree | 9d0b1bc0a52095af67f23f651b577acd47506a3c /meta | |
parent | ad43cc66d21d0623d49b193b44e8d3837cc2fe02 (diff) | |
download | poky-9d00a01831f22d93d4ac9a7e7151758e428b9750.tar.gz |
apt: Do not disable NLS
Add a patch to disable cmake po targets
(From OE-Core rev: 28ba2ddcf73400263ae8409f64190d5f109c44b8)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/apt/apt/0001-cmake-Do-not-build-po-files.patch | 37 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt_2.2.2.bb | 3 |
2 files changed, 39 insertions, 1 deletions
diff --git a/meta/recipes-devtools/apt/apt/0001-cmake-Do-not-build-po-files.patch b/meta/recipes-devtools/apt/apt/0001-cmake-Do-not-build-po-files.patch new file mode 100644 index 0000000000..2837b7f1b3 --- /dev/null +++ b/meta/recipes-devtools/apt/apt/0001-cmake-Do-not-build-po-files.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 33347f9f8301633b01af4e208b7be5fdfcb0df0c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 20 Mar 2021 14:45:18 -0700 | ||
4 | Subject: [PATCH] cmake: Do not build po files | ||
5 | |||
6 | Fixes | ||
7 | | CMake Error at CMakeLists.txt:252 (add_dependencies): | ||
8 | | The dependency target "update-po4a" of target "update-po" does not exist. | ||
9 | | | ||
10 | |||
11 | Upstream-Status: Inappropriate [Cross-compile specific] | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | CMakeLists.txt | 7 ------- | ||
15 | 1 file changed, 7 deletions(-) | ||
16 | |||
17 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
18 | index 3c8ec3f..821a24f 100644 | ||
19 | --- a/CMakeLists.txt | ||
20 | +++ b/CMakeLists.txt | ||
21 | @@ -245,13 +245,6 @@ add_subdirectory(ftparchive) | ||
22 | add_subdirectory(methods) | ||
23 | add_subdirectory(test) | ||
24 | |||
25 | -if (USE_NLS) | ||
26 | -add_subdirectory(po) | ||
27 | - | ||
28 | -# Link update-po4a into the update-po target | ||
29 | -add_dependencies(update-po update-po4a) | ||
30 | -endif() | ||
31 | - | ||
32 | # Create our directories. | ||
33 | install_empty_directories( | ||
34 | ${CONF_DIR}/apt.conf.d | ||
35 | -- | ||
36 | 2.31.0 | ||
37 | |||
diff --git a/meta/recipes-devtools/apt/apt_2.2.2.bb b/meta/recipes-devtools/apt/apt_2.2.2.bb index 7ee661d4c8..d1aa5de8df 100644 --- a/meta/recipes-devtools/apt/apt_2.2.2.bb +++ b/meta/recipes-devtools/apt/apt_2.2.2.bb | |||
@@ -11,6 +11,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \ | |||
11 | file://0001-Fix-musl-build.patch \ | 11 | file://0001-Fix-musl-build.patch \ |
12 | file://0001-CMakeLists.txt-avoid-changing-install-paths-based-on.patch \ | 12 | file://0001-CMakeLists.txt-avoid-changing-install-paths-based-on.patch \ |
13 | file://0001-srvrec-Keep-support-for-older-resolver.patch \ | 13 | file://0001-srvrec-Keep-support-for-older-resolver.patch \ |
14 | file://0001-cmake-Do-not-build-po-files.patch \ | ||
14 | " | 15 | " |
15 | 16 | ||
16 | SRC_URI_append_class-native = " \ | 17 | SRC_URI_append_class-native = " \ |
@@ -41,7 +42,7 @@ BBCLASSEXTEND = "native nativesdk" | |||
41 | DEPENDS += "db gnutls lz4 zlib bzip2 xz libgcrypt xxhash" | 42 | DEPENDS += "db gnutls lz4 zlib bzip2 xz libgcrypt xxhash" |
42 | 43 | ||
43 | EXTRA_OECMAKE_append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \ | 44 | EXTRA_OECMAKE_append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \ |
44 | -DUSE_NLS=False -DDPKG_DATADIR=${datadir}/dpkg \ | 45 | -DDPKG_DATADIR=${datadir}/dpkg \ |
45 | -DTRIEHASH_EXECUTABLE=${WORKDIR}/triehash \ | 46 | -DTRIEHASH_EXECUTABLE=${WORKDIR}/triehash \ |
46 | -DWITH_TESTS=False \ | 47 | -DWITH_TESTS=False \ |
47 | " | 48 | " |