diff options
Diffstat (limited to 'meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch')
-rw-r--r-- | meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch b/meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch new file mode 100644 index 000000000..d9e10469d --- /dev/null +++ b/meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From 655c5c32b37a2bea12389ed69c0869215fcf5abe Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sun, 3 Sep 2023 11:22:35 +0200 | ||
4 | Subject: [PATCH] CMakeLists.txt: don't fall back CMAKE_INSTALL_LIBDIR to lib | ||
5 | |||
6 | * testing ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} existence | ||
7 | doesn't really work in cross compilation and on some hosts was causing: | ||
8 | |||
9 | ERROR: QA Issue: libcyusbserial: Files/directories were installed but not shipped in any package: | ||
10 | /usr/lib/libcyusbserial.so.1 | ||
11 | /usr/lib/libcyusbserial.so | ||
12 | Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. | ||
13 | libcyusbserial: 2 installed and not shipped files. [installed-vs-shipped] | ||
14 | |||
15 | with multilib using /usr/lib32 or /usr/lib64 when the same didn't | ||
16 | exist on host. | ||
17 | |||
18 | Upstream-Status: Pending | ||
19 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
20 | --- | ||
21 | lib/CMakeLists.txt | 9 --------- | ||
22 | 1 file changed, 9 deletions(-) | ||
23 | |||
24 | diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt | ||
25 | index 2b031cb..53a7263 100644 | ||
26 | --- a/lib/CMakeLists.txt | ||
27 | +++ b/lib/CMakeLists.txt | ||
28 | @@ -6,15 +6,6 @@ if (NOT CMAKE_INSTALL_LIBDIR) | ||
29 | include(GNUInstallDirs) | ||
30 | endif (NOT CMAKE_INSTALL_LIBDIR) | ||
31 | |||
32 | -# Fall back to just "lib" if the item provided by GNUInstallDirs doesn't exist | ||
33 | -# For example, on Ubuntu 13.10 with CMake 2.8.11.2, | ||
34 | -# /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE} doesn't exist. | ||
35 | -if (NOT EXISTS "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") | ||
36 | - message(STATUS "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} does not exist. Defaulting libcyusbserial install location to ${CMAKE_INSTALL_PREFIX}/lib.") | ||
37 | - set(CMAKE_INSTALL_LIBDIR lib) | ||
38 | -endif() | ||
39 | - | ||
40 | - | ||
41 | ################################################################################ | ||
42 | # Include paths | ||
43 | ################################################################################ | ||