summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2011-08-15 16:16:31 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-17 14:14:54 (GMT)
commitb7937a4f3946c72516f772ea21db28694c558f7b (patch)
treef51b15efa93d8f2b63bfb50fe3c0585a0bcc3b44 /meta/classes
parenta21ff559e7c93e9da61104f4a33e42e6004189fd (diff)
downloadpoky-b7937a4f3946c72516f772ea21db28694c558f7b.tar.gz
cmake.bbclass, perlnative.bbclass: arrange for cmake to find perl-native
When CMake is looking for perl, it only searches in the specific directories that it's told about and ignores ${PATH}. If perlnative is in use, ensure that the appropriate installation path is added to the list of places that cmake will look for perl, otherwise it won't ever be found. (From OE-Core rev: add9e4e30e0b1e0f93479b43ce61953efb90985d) Signed-off-by: Phil Blundell <philb@gnu.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/cmake.bbclass3
-rw-r--r--meta/classes/perlnative.bbclass1
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 89a154f..ab23bed 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -25,6 +25,7 @@ OECMAKE_C_FLAGS_RELEASE ?= "${SELECTED_OPTIMIZATION} ${CPPFLAGS} -DNDEBUG"
25OECMAKE_CXX_FLAGS_RELEASE ?= "${SELECTED_OPTIMIZATION} ${CXXFLAGS} -DNDEBUG" 25OECMAKE_CXX_FLAGS_RELEASE ?= "${SELECTED_OPTIMIZATION} ${CXXFLAGS} -DNDEBUG"
26 26
27OECMAKE_RPATH ?= "" 27OECMAKE_RPATH ?= ""
28OECMAKE_PERLNATIVE_DIR ??= ""
28 29
29cmake_do_generate_toolchain_file() { 30cmake_do_generate_toolchain_file() {
30 cat > ${WORKDIR}/toolchain.cmake <<EOF 31 cat > ${WORKDIR}/toolchain.cmake <<EOF
@@ -41,7 +42,7 @@ set( CMAKE_CXX_FLAGS_RELEASE "${OECMAKE_CXX_FLAGS_RELEASE}" CACHE STRING "CXXFLA
41 42
42# only search in the paths provided so cmake doesnt pick 43# only search in the paths provided so cmake doesnt pick
43# up libraries and tools from the native build machine 44# up libraries and tools from the native build machine
44set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} ${CROSS_DIR} ) 45set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} ${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR})
45set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY ) 46set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY )
46set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) 47set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
47set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) 48set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
diff --git a/meta/classes/perlnative.bbclass b/meta/classes/perlnative.bbclass
index 522344d..2211b72 100644
--- a/meta/classes/perlnative.bbclass
+++ b/meta/classes/perlnative.bbclass
@@ -1,2 +1,3 @@
1PATH_prepend = "${STAGING_BINDIR_NATIVE}/perl-native:" 1PATH_prepend = "${STAGING_BINDIR_NATIVE}/perl-native:"
2DEPENDS += "perl-native" 2DEPENDS += "perl-native"
3OECMAKE_PERLNATIVE_DIR = "${STAGING_BINDIR_NATIVE}/perl-native"