diff options
| -rw-r--r-- | meta-oe/recipes-support/libharu/libharu/0001-Install-static-lib-into-var-libdir-rather-than-hardc.patch | 30 | ||||
| -rw-r--r-- | meta-oe/recipes-support/libharu/libharu_2.3.0.bb | 1 |
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 @@ | |||
| 1 | From 9341ac4f6ae38efe95dfd188105a9ea30941ccf6 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Lei Maohui <leimaohui@cn.fujitsu.com> | ||
| 3 | Date: Wed, 18 Nov 2020 23:09:51 +0900 | ||
| 4 | Subject: [PATCH] Install static lib into var-libdir rather than hardcod lib. | ||
| 5 | |||
| 6 | Lei Maohui <leimaohui@cn.fujitsu.com> | ||
| 7 | |||
| 8 | Upstream-Status: Pending | ||
| 9 | --- | ||
| 10 | src/CMakeLists.txt | 4 ++-- | ||
| 11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | ||
| 14 | index 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 | -- | ||
| 29 | 2.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 | ||
| 9 | SRC_URI = "git://github.com/libharu/libharu.git;branch=2_3 \ | 9 | SRC_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 | ||
| 13 | SRCREV = "4ae1d5f4c84459f130bf1b1ef4c5c330af8eca5d" | 14 | SRCREV = "4ae1d5f4c84459f130bf1b1ef4c5c330af8eca5d" |
