Ticket #48376: root6-WithPythonFix.diff

File root6-WithPythonFix.diff, 5.2 KB (added by cjones051073 (Chris Jones), 9 years ago)

  • Portfile

     
    1010PortGroup           select 1.0
    1111
    1212# don't forget to update both the git tag and the version
    13 #github.setup        root-mirror root 9ab0642adeca5d3703783bdbfeebfca86ea22af9
    14 github.setup        root-mirror root 6-04-00 v
    15 version             6.04.00
     13github.setup        root-mirror root b43f80bccfd6b67be37708c4a5a9386b7c850d29
     14#github.setup        root-mirror root 6-04-02 v
     15version             6.04.02.99
    1616
    1717# this could be a better way to set the version (unless we use a sha sum for the git tag ;)
    1818# version           [string map {- .} $version]
    1919set version_major   [lindex [split ${version} .] 0]
    2020
    21 checksums           rmd160  41daa7cd2b04fd6a78bd60e626ad550383a87b05 \
    22                     sha256  1fae9b33e18a613a90619b5c0a5c950e0897319db2f045d1414bd76628547a37
     21checksums           rmd160  d4025bb6e0fe4157a145de142fd2f40490c68ac4 \
     22                    sha256  9bf93ef6b52e3aaedbaf6c6b2aa78d6dba5c7ec9672d7d78fb173fbab7ac7b9a
    2323
    2424name                root${version_major}
    2525categories          science
    … …  
    6060compiler.blacklist-append *gcc* {clang < 500} \
    6161                          macports-clang-2.9 macports-clang-3.0 macports-clang-3.1 \
    6262                          macports-clang-3.2 macports-clang-3.3
    63 compiler.fallback-append  macports-clang-3.6 macports-clang-3.5 macports-clang-3.4
     63compiler.fallback-append  macports-clang-3.7 macports-clang-3.6 macports-clang-3.5 \
     64                          macports-clang-3.4
    6465
    6566# port specific location
    6667set install_prefix ${prefix}/libexec/root${version_major}
    … …  
    102103                    -Dbonjour=OFF \
    103104                    -Dgviz=OFF \
    104105                    -Dsoversion=OFF \
    105                     -Dc++11=ON \
     106                    -Dcxx11=ON \
    106107                    -Dlibcxx=ON \
    107108                    -Dxrootd=OFF \
    108109                    -Dbuiltin_ftgl=ON \
    … …  
    126127            ui_error "${name} is not supported on this OSX release."
    127128            return -code error "Unsupported OSX version"
    128129        }
    129     } 
    130 
     130    }
     131   
    131132    # Note that we are forcing this choice.  This means that anything linking
    132133    # against root6 needs to also be using libc++.  This is possibly
    133134    # problematic, but luckily there is just a limited set of such dependents.
    … …  
    138139        depends_lib-append port:libcxx
    139140    }
    140141
    141     # replace
    142     #   -DCMAKE_OSX_SYSROOT="/Developer/SDKs/MacOSX10.6.sdk"
    143     #   -DCMAKE_OSX_DEPLOYMENT_TARGET="10.6"
    144     # with
    145     #   -DCMAKE_OSX_SYSROOT="/"
    146     #   -DCMAKE_OSX_DEPLOYMENT_TARGET=""
    147142    pre-configure {
     143       
     144        # replace
     145        #   -DCMAKE_OSX_SYSROOT="/Developer/SDKs/MacOSX10.6.sdk"
     146        #   -DCMAKE_OSX_DEPLOYMENT_TARGET="10.6"
     147        # with
     148        #   -DCMAKE_OSX_SYSROOT="/"
     149        #   -DCMAKE_OSX_DEPLOYMENT_TARGET=""
    148150        configure.args-strsed "s|CMAKE_OSX_SYSROOT=\[^\[:blank:\]\]*|CMAKE_OSX_SYSROOT=\"/\"|"
    149151        configure.args-strsed "s|CMAKE_OSX_DEPLOYMENT_TARGET=\[^\[:blank:\]\]*|CMAKE_OSX_DEPLOYMENT_TARGET=\"\"|"
     152
     153        # Force use of system python in build scripts
     154        # Find command finds text files containing the string to be replaced.
     155        # shtest-encoding.py intentionally includes an unreadable character, so have to skip it ...
     156        set pystringtoreplace "/usr/bin/env python"
     157        foreach f [ exec find ${worksrcpath} -type f -and -not -name "shtest-encoding.py" -and -name "*.py" ] {
     158            reinplace "s|${pystringtoreplace}|/usr/bin/python|g" $f
     159        }
     160                   
    150161    }
     162
    151163}
    152164
    153165post-destroot {
    … …  
    216228    set default_gui_variant +x11
    217229}
    218230
     231variant cxx14 description {Enable c++14 compiler support} {
     232    configure.args-append   -Dcxx14=ON
     233}
     234
    219235variant valgrind description {Build internal LLVM library with valgrind support} {
    220236    depends_lib-append      port:valgrind
    221237}
    … …  
    376392        depends_lib-append      port:python${py_ver_no_dot}
    377393       
    378394        post-destroot {
     395            # Install PyROOT lib in the correct place
    379396            set mypylibdir  ${prefix}/Library/Frameworks/Python.framework/Versions/${active_python_version}/lib/python${active_python_version}
    380397            set mypysitedir ${mypylibdir}/site-packages/
    381398            file mkdir ${destroot}${mypysitedir}
    382399            foreach pyfile [glob ${destroot}${install_prefix}/lib/root/*.py*] { move $pyfile ${destroot}${mypysitedir}/ }
    383400            ln -sf ${install_prefix}/lib/root/libPyROOT.so ${destroot}${mypylibdir}/
     401            # Fix python version in scripts
     402            set pystringtoreplace "/usr/bin/python"
     403            foreach f [ exec find ${destroot}${install_prefix} -type f -and -name "*.py" ] {
     404                reinplace "s|${pystringtoreplace}|${prefix}/bin/python${active_python_version}|g" $f
     405            }
    384406        }
    385407
    386408    }
    … …  
    566588# ========================================================================================
    567589
    568590set gcc_versions { 4.7 4.8 4.9 5 }
    569 set default_fortran_variant +gcc48
     591set default_fortran_variant +gcc5
    570592
    571593foreach gcc_ver ${gcc_versions} {
    572594    set gcc_ver_no_dot [join [split ${gcc_ver} "."] ""]