Review Request 123531: Build Cantor with the R backend also when the R version is equal or higher 3.2

[Filipe Saraiva]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/123531/#review80809
-----------------------------------------------------------

Ship it!


Thanks Raymond, please push it to master branch and use [Review](https://techbase.kde.org/Policies/Commit_Policy#Special_keywords_in_GIT_and_SVN_log_messages) special keyword in the commit message.

If you can not to do it, let me know and I will push for you.

- Filipe Saraiva


On Abril 27, 2015, 2:23 p.m., Raymond Wooninck wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/123531/
> -----------------------------------------------------------
> 
> (Updated Abril 27, 2015, 2:23 p.m.)
> 
> 
> Review request for KDE Edu, Alexander Rieder and Filipe Saraiva.
> 
> 
> Repository: cantor
> 
> 
> Description
> -------
> 
> In this commit:
> https://github.com/wch/r-source/commit/c67a107dd7b0f074cec9359b8e2ca07c6243283c
> 
> R_running_as_main_program was moved from Rmain.c to Rinterface.h, and lost
> its 'extern' declaration. This change is now causing linker problems when trying to build cantor against R v3.2 :
> 
> [  391s] CMakeFiles/cantor_rserver.dir/rcallbacks.o:(.bss+0x10): multiple definition of `R_running_as_main_program'
> [  391s] CMakeFiles/cantor_rserver.dir/rserver.o:(.bss+0x0): first defined here
> [  391s] collect2: error: ld returned 1 exit status
> [  391s] src/backends/R/rserver/CMakeFiles/cantor_rserver.dir/build.make:247: recipe for target 'src/backends/R/rserver/cantor_rserver' failed
> [  391s] make[2]: *** [src/backends/R/rserver/cantor_rserver] Error 1
> 
> The attached patch would resolve the multiple definition.
> 
> 
> Diffs
> -----
> 
>   src/backends/R/rserver/rcallbacks.h 8f4752c 
>   src/backends/R/rserver/rcallbacks.cpp 2c86531 
>   src/backends/R/rserver/rserver.cpp 30cdb70 
> 
> Diff: https://git.reviewboard.kde.org/r/123531/diff/
> 
> 
> Testing
> -------
> 
> Cantor builds fine for R v3.1.1 and R v3.2 versions
> 
> 
> Thanks,
> 
> Raymond Wooninck
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-edu/attachments/20150525/dfe63fda/attachment.html>