diff options
| author |   Andrew Savchenko <bircoph@gmail.com> | 2014-07-02 17:29:12 +0400 |
|---|---|---|
| committer | Andrew Savchenko <bircoph@gmail.com> | 2014-07-02 17:29:12 +0400 |
| commit | a1c3b313be5be9716a761a762ea3651070ed9e43 (patch) | |
| tree | 9df86c7140ec31f80b59c547e3b054e9210f8aec /sci-physics/root/files/root-6.00.01-cling.patch | |
| parent | Merge remote-tracking branch 'gentoo/master' into upstream-master (diff) | |
| download | sci-a1c3b313be5be9716a761a762ea3651070ed9e43.tar.gz sci-a1c3b313be5be9716a761a762ea3651070ed9e43.tar.bz2 sci-a1c3b313be5be9716a761a762ea3651070ed9e43.zip | |
sci-physics/root: fix Cling library load
It was broken for prefix builds (that's how ROOT is installed in
Gentoo. See bug https://sft.its.cern.ch/jira/browse/ROOT-6410.
Diffstat (limited to 'sci-physics/root/files/root-6.00.01-cling.patch')
| -rw-r--r-- | sci-physics/root/files/root-6.00.01-cling.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/sci-physics/root/files/root-6.00.01-cling.patch b/sci-physics/root/files/root-6.00.01-cling.patch new file mode 100644 index 000000000..146e89fde --- /dev/null +++ b/sci-physics/root/files/root-6.00.01-cling.patch @@ -0,0 +1,19 @@ +commit eea9517c17bd86beda895a5a8b3ffe59af18596f +Author: Axel Naumann <Axel.Naumann@cern.ch> +Date: Tue Jul 1 17:45:20 2014 +0200 + + From Pere: go via TSystem to use prefix if defined (ROOT-6410). + +diff --git a/core/meta/src/TCling.cxx b/core/meta/src/TCling.cxx +index baec571..4976d4e 100644 +--- a/core/meta/src/TCling.cxx ++++ b/core/meta/src/TCling.cxx +@@ -4703,7 +4703,7 @@ void* TCling::LazyFunctionCreatorAutoload(const std::string& mangled_name) { + TString lib; + Ssiz_t posLib = 0; + while (libs.Tokenize(lib, posLib)) { +- if (Load(lib, kFALSE /*system*/) < 0) { ++ if (gSystem->Load(lib, "", kFALSE /*system*/) < 0) { + // The library load failed, all done. + //fprintf(stderr, "load failed: %s\n", errmsg.c_str()); + return 0; |