summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzangrc <zangrc.fnst@cn.fujitsu.com>2020-11-20 21:06:16 +0800
committerKhem Raj <raj.khem@gmail.com>2020-11-23 07:09:34 -0800
commit53a143eeb716e5160185bd339b65bcbea9ee6b1e (patch)
tree8776b411d6043ef74fc3402fe99c3d36d9aea299
parenta62201c7a743fdc8709b0563b2f750760dace29d (diff)
downloadmeta-openembedded-53a143eeb716e5160185bd339b65bcbea9ee6b1e.tar.gz
libharu: Fix the packaging bug
The following error will occur when multilib is enabled: ERROR: libharu-2.3.0-r0 do_package: QA Issue: libharu: Files/directories were installed but not shipped in any package: /usr/lib /usr/lib/libhpdfs.a Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. libharu: 2 installed and not shipped files. [installed-vs-shipped] ERROR: libharu-2.3.0-r0 do_package: Fatal QA errors found, failing task. Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/libharu/libharu/0001-Install-static-lib-into-var-libdir-rather-than-hardc.patch30
-rw-r--r--meta-oe/recipes-support/libharu/libharu_2.3.0.bb1
2 files changed, 31 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/libharu/libharu/0001-Install-static-lib-into-var-libdir-rather-than-hardc.patch b/meta-oe/recipes-support/libharu/libharu/0001-Install-static-lib-into-var-libdir-rather-than-hardc.patch
new file mode 100644
index 0000000000..0947de196c
--- /dev/null
+++ b/meta-oe/recipes-support/libharu/libharu/0001-Install-static-lib-into-var-libdir-rather-than-hardc.patch
@@ -0,0 +1,30 @@
1From 9341ac4f6ae38efe95dfd188105a9ea30941ccf6 Mon Sep 17 00:00:00 2001
2From: Lei Maohui <leimaohui@cn.fujitsu.com>
3Date: Wed, 18 Nov 2020 23:09:51 +0900
4Subject: [PATCH] Install static lib into var-libdir rather than hardcod lib.
5
6Lei Maohui <leimaohui@cn.fujitsu.com>
7
8Upstream-Status: Pending
9---
10 src/CMakeLists.txt | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
14index 249916c..fb06ea3 100644
15--- a/src/CMakeLists.txt
16+++ b/src/CMakeLists.txt
17@@ -75,8 +75,8 @@ if(LIBHPDF_STATIC)
18 target_link_libraries(${LIBHPDF_NAME_STATIC} ${ADDITIONAL_LIBRARIES})
19 install(
20 TARGETS ${LIBHPDF_NAME_STATIC}
21- ARCHIVE DESTINATION lib
22- LIBRARY DESTINATION lib
23+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
24+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
25 RUNTIME DESTINATION bin
26 )
27 if(WIN32 AND NOT CYGWIN)
28--
292.25.1
30
diff --git a/meta-oe/recipes-support/libharu/libharu_2.3.0.bb b/meta-oe/recipes-support/libharu/libharu_2.3.0.bb
index 2d1a37c421..8d30c1f7b1 100644
--- a/meta-oe/recipes-support/libharu/libharu_2.3.0.bb
+++ b/meta-oe/recipes-support/libharu/libharu_2.3.0.bb
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://README;md5=3ee6bc1f64d9cc7907f44840c8e50cb1"
8 8
9SRC_URI = "git://github.com/libharu/libharu.git;branch=2_3 \ 9SRC_URI = "git://github.com/libharu/libharu.git;branch=2_3 \
10 file://libharu-RELEASE_2_3_0_cmake.patch \ 10 file://libharu-RELEASE_2_3_0_cmake.patch \
11 file://0001-Install-static-lib-into-var-libdir-rather-than-hardc.patch \
11 " 12 "
12 13
13SRCREV = "4ae1d5f4c84459f130bf1b1ef4c5c330af8eca5d" 14SRCREV = "4ae1d5f4c84459f130bf1b1ef4c5c330af8eca5d"