Ticket #44062: root-x11fix.diff
File root-x11fix.diff, 1.8 KB (added by cjones051073 (Chris Jones), 10 years ago) |
---|
-
Portfile
61 61 62 62 patchfiles patch-cmake-modules-SearchInstalledSoftware.cmake.diff 63 63 64 # an ugly workaround for lack of __thread on 10.665 platform darwin 10 {66 patchfiles-append \67 patch-montecarlo-vmc-inc-TMCtls.h.diff68 }69 70 64 # Force a compatible compiler 71 65 # (macports-clang-3.3 works; it's blacklisted only to give the preference to 3.4) 72 66 compiler.blacklist-append *gcc* {clang < 500} macports-clang-2.9 macports-clang-3.0 macports-clang-3.1 macports-clang-3.2 macports-clang-3.3 … … 127 121 128 122 configure.post_args ${worksrcpath} 129 123 124 # Work arounds for OSX 10.6 125 platform darwin 10 { 126 # an ugly workaround for lack of __thread 127 patchfiles-append patch-montecarlo-vmc-inc-TMCtls.h.diff 128 } 129 130 130 platform darwin { 131 131 # Note that we are forcing this choice. This means that anything linking 132 132 # against root6 needs to also be using libc++. This is possibly … … 206 206 207 207 universal_variant no 208 208 209 default_variants +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz + opengl +soversion209 default_variants +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +soversion 210 210 211 211 # Since ROOT 5.34.15 the cocoa backend is default on OSX 10.8 or newer 212 212 # We also make it default on 10.7 … … 437 437 variant cocoa conflicts x11 description {Enables native OSX graphical backend} { 438 438 # Enable cocoa support in configure 439 439 configure.args-append -Dcocoa=ON -Dx11=OFF 440 # Enable the OpenGL variant by default when Cocoa backend is used. 441 # Do this here, as OpenGL conflicts with the X11 backend... 442 default_variants-append +opengl 440 443 } 441 444 442 445 variant x11 conflicts cocoa description {Enables X11 graphical backend} {