[OE-core] [PATCH] cmake.bbclass, perlnative.bbclass: arrange for cmake to find perl-native

[Saul Wold]

On 08/19/2011 09:26 AM, Phil Blundell wrote:
> Ping?
>
Was pulled earlier this week, RP and I have been at LinuxCon this week, 
I am attempting to do some catch up now, but Merge ACKs will be delayed 
until the weekend or next week.

Merged into OE-Core

Thanks
	
Sau!


> p.
>
> On Mon, 2011-08-15 at 17:16 +0100, Phil Blundell wrote:
>> 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.
>>
>> Signed-off-by: Phil Blundell<philb at gnu.org>
>> ---
>>   meta/classes/cmake.bbclass      |    3 ++-
>>   meta/classes/perlnative.bbclass |    1 +
>>   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"
>>   OECMAKE_CXX_FLAGS_RELEASE ?= "${SELECTED_OPTIMIZATION} ${CXXFLAGS} -DNDEBUG"
>>
>>   OECMAKE_RPATH ?= ""
>> +OECMAKE_PERLNATIVE_DIR ??= ""
>>
>>   cmake_do_generate_toolchain_file() {
>>   	cat>  ${WORKDIR}/toolchain.cmake<<EOF
>> @@ -41,7 +42,7 @@ set( CMAKE_CXX_FLAGS_RELEASE "${OECMAKE_CXX_FLAGS_RELEASE}" CACHE STRING "CXXFLA
>>
>>   # only search in the paths provided so cmake doesnt pick
>>   # up libraries and tools from the native build machine
>> -set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} ${CROSS_DIR} )
>> +set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} ${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR})
>>   set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY )
>>   set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
>>   set( 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 @@
>>   PATH_prepend = "${STAGING_BINDIR_NATIVE}/perl-native:"
>>   DEPENDS += "perl-native"
>> +OECMAKE_PERLNATIVE_DIR = "${STAGING_BINDIR_NATIVE}/perl-native"
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>