diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
| commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
| tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv/0001-CMakeLists.txt-fix-MAN_INSTALL_DIR.patch | |
| parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
| download | blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip | |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv/0001-CMakeLists.txt-fix-MAN_INSTALL_DIR.patch')
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv/0001-CMakeLists.txt-fix-MAN_INSTALL_DIR.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv/0001-CMakeLists.txt-fix-MAN_INSTALL_DIR.patch b/import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv/0001-CMakeLists.txt-fix-MAN_INSTALL_DIR.patch new file mode 100644 index 000000000..972ecc9c5 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv/0001-CMakeLists.txt-fix-MAN_INSTALL_DIR.patch @@ -0,0 +1,37 @@ +From 280f0d37c642d68bad2a2e49ef437953474d99e6 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Wed, 6 Apr 2016 23:15:02 -0700 +Subject: [PATCH] CMakeLists.txt: fix MAN_INSTALL_DIR + +It checks ${CMAKE_INSTALL_PREFIX}/share/man when configure, but it may +not exist when crosscompile, for example, when CMAKE_INSTALL_PREFIX="/", +it is OK, but when CMAKE_INSTALL_PREFIX="/some/path/else", then it +doesn't exist, and the man dir would be set to "/usr/man" which is +incorrect. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + CMakeLists.txt | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fd1426b..747db22 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -57,10 +57,7 @@ else (DEFINED INCLUDE) + ENDIF (DEFINED INCLUDE) + MESSAGE (STATUS "Header files will be installed in ${INCLUDE_INSTALL_DIR}") + SET (BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin") +-SET (MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/man") +-IF (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/share/man" AND NOT IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/man") +- SET (MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/man") +-ENDIF (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/share/man" AND NOT IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/man") ++SET (MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/man") + MESSAGE(STATUS "Man pages will be installed in ${MAN_INSTALL_DIR}") + + #################################################################### +-- +2.7.4 + |
