On 2011-11-08 03:48, Vladislav Vaintroub wrote:
>
>> -----Original Message-----
>> From: Tor Didriksen [mailto:tor.didriksen@stripped]
>> Sent: Montag, 7. November 2011 13:18
>> To: commits@stripped
>> Subject: bzr push into mysql-trunk branch (tor.didriksen:3567 to 3568)
>> WL#5825
>>
> Hi Tor,
>
>
>> storage/innobase/handler/ha_innodb.cc
>> === modified file 'configure.cmake'
>> --- a/configure.cmake 2011-11-04 12:59:47 +0000
>> +++ b/configure.cmake 2011-11-07 12:17:24 +0000
>> @@ -82,9 +82,12 @@ ENDMACRO()
>> IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND
>> CMAKE_C_COMPILER_ID MATCHES "SunPro")
>> DIRNAME(${CMAKE_CXX_COMPILER} CXX_PATH)
>> SET(STLPORT_SUFFIX "lib/stlport4")
>> - IF(CMAKE_CXX_FLAGS MATCHES "-m64")
>> + IF(CMAKE_CXX_FLAGS MATCHES "-m64" AND
>> CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
> CMAKE_CXX_FLAGS MATCHES is not-so-straightforward way to find out that
> CMAKE_SIZEOF_VOID_P EQUALS 8
> CMake runs compiler checks and knows the void * size already
>
ok, maybe sizeof_void_p is a better check than -m64
>> FIND_LIBRARY(STL_LIBRARY_NAME
>> NAMES "stlport"
>> @@ -94,7 +97,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND
>> IF(STL_LIBRARY_NAME)
>> DIRNAME(${STL_LIBRARY_NAME} STLPORT_PATH)
>> # We re-distribute libstlport.so which is a symlink to libstlport.so.1
>> - # There is no 'readlink' on solaris, sigh ..., so we use perl to find it:
>> + # There is no 'readlink' on solaris, so we use perl to follow links:
>> SET(PERLSCRIPT
>> "my $link= $ARGV[0]; use Cwd qw(abs_path); my $file = abs_path($link);
>> print $file;")
>> EXECUTE_PROCESS(
> Looks complicated . Why do you need Perl here? get_filename_component (...REALPATH)
> does not work ?
>
>
>
alas, pushbuild is still using cmake 2.6
once again: thanks for keeping an eye on what's going on
-- didrik
