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

[Raymond Wooninck]

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

(Updated May 25, 2015, 1:20 p.m.)


Status
------

This change has been marked as submitted.


Review request for KDE Edu, Alexander Rieder and Filipe Saraiva.


Changes
-------

Submitted with commit 88b14d85b9504af29fa34ac41109db6ff1d8bdf5 by Raymond Wooninck to branch master.


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/8f9b94f9/attachment-0001.html>