[139082] trunk/dports/science/root6/Portfile
mojca at macports.org
mojca at macports.org
Fri Jul 31 06:07:18 PDT 2015
Revision: 139082
https://trac.macports.org/changeset/139082
Author: mojca at macports.org
Date: 2015-07-31 06:07:18 -0700 (Fri, 31 Jul 2015)
Log Message:
-----------
root6: upgrade to version 6.04.02 (closes #48376)
Modified Paths:
--------------
trunk/dports/science/root6/Portfile
Modified: trunk/dports/science/root6/Portfile
===================================================================
--- trunk/dports/science/root6/Portfile 2015-07-31 11:10:38 UTC (rev 139081)
+++ trunk/dports/science/root6/Portfile 2015-07-31 13:07:18 UTC (rev 139082)
@@ -10,16 +10,16 @@
PortGroup select 1.0
# don't forget to update both the git tag and the version
-#github.setup root-mirror root 9ab0642adeca5d3703783bdbfeebfca86ea22af9
-github.setup root-mirror root 6-04-00 v
-version 6.04.00
+github.setup root-mirror root b43f80bccfd6b67be37708c4a5a9386b7c850d29
+#github.setup root-mirror root 6-04-02 v
+version 6.04.02.99
# this could be a better way to set the version (unless we use a sha sum for the git tag ;)
# version [string map {- .} $version]
set version_major [lindex [split ${version} .] 0]
-checksums rmd160 41daa7cd2b04fd6a78bd60e626ad550383a87b05 \
- sha256 1fae9b33e18a613a90619b5c0a5c950e0897319db2f045d1414bd76628547a37
+checksums rmd160 d4025bb6e0fe4157a145de142fd2f40490c68ac4 \
+ sha256 9bf93ef6b52e3aaedbaf6c6b2aa78d6dba5c7ec9672d7d78fb173fbab7ac7b9a
name root${version_major}
categories science
@@ -60,7 +60,8 @@
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
-compiler.fallback-append macports-clang-3.6 macports-clang-3.5 macports-clang-3.4
+compiler.fallback-append macports-clang-3.7 macports-clang-3.6 macports-clang-3.5 \
+ macports-clang-3.4
# port specific location
set install_prefix ${prefix}/libexec/root${version_major}
@@ -102,7 +103,7 @@
-Dbonjour=OFF \
-Dgviz=OFF \
-Dsoversion=OFF \
- -Dc++11=ON \
+ -Dcxx11=ON \
-Dlibcxx=ON \
-Dxrootd=OFF \
-Dbuiltin_ftgl=ON \
@@ -126,7 +127,7 @@
ui_error "${name} is not supported on this OSX release."
return -code error "Unsupported OSX version"
}
- }
+ }
# Note that we are forcing this choice. This means that anything linking
# against root6 needs to also be using libc++. This is possibly
@@ -138,15 +139,23 @@
depends_lib-append port:libcxx
}
- # replace
- # -DCMAKE_OSX_SYSROOT="/Developer/SDKs/MacOSX10.6.sdk"
- # -DCMAKE_OSX_DEPLOYMENT_TARGET="10.6"
- # with
- # -DCMAKE_OSX_SYSROOT="/"
- # -DCMAKE_OSX_DEPLOYMENT_TARGET=""
pre-configure {
+ # replace
+ # -DCMAKE_OSX_SYSROOT="/Developer/SDKs/MacOSX10.6.sdk"
+ # -DCMAKE_OSX_DEPLOYMENT_TARGET="10.6"
+ # with
+ # -DCMAKE_OSX_SYSROOT="/"
+ # -DCMAKE_OSX_DEPLOYMENT_TARGET=""
configure.args-strsed "s|CMAKE_OSX_SYSROOT=\[^\[:blank:\]\]*|CMAKE_OSX_SYSROOT=\"/\"|"
configure.args-strsed "s|CMAKE_OSX_DEPLOYMENT_TARGET=\[^\[:blank:\]\]*|CMAKE_OSX_DEPLOYMENT_TARGET=\"\"|"
+
+ # Force use of system python in build scripts
+ # Find command finds text files containing the string to be replaced.
+ # shtest-encoding.py intentionally includes an unreadable character, so have to skip it ...
+ set pystringtoreplace "/usr/bin/env python"
+ foreach f [ exec find ${worksrcpath} -type f -and -not -name "shtest-encoding.py" -and -name "*.py" ] {
+ reinplace "s|${pystringtoreplace}|/usr/bin/python|g" $f
+ }
}
}
@@ -216,6 +225,10 @@
set default_gui_variant +x11
}
+variant cxx14 description {Enable c++14 compiler support} {
+ configure.args-append -Dcxx14=ON
+}
+
variant valgrind description {Build internal LLVM library with valgrind support} {
depends_lib-append port:valgrind
}
@@ -376,11 +389,17 @@
depends_lib-append port:python${py_ver_no_dot}
post-destroot {
+ # Install PyROOT lib in the correct place
set mypylibdir ${prefix}/Library/Frameworks/Python.framework/Versions/${active_python_version}/lib/python${active_python_version}
set mypysitedir ${mypylibdir}/site-packages/
file mkdir ${destroot}${mypysitedir}
foreach pyfile [glob ${destroot}${install_prefix}/lib/root/*.py*] { move $pyfile ${destroot}${mypysitedir}/ }
ln -sf ${install_prefix}/lib/root/libPyROOT.so ${destroot}${mypylibdir}/
+ # Fix python version in scripts
+ set pystringtoreplace "/usr/bin/python"
+ foreach f [ exec find ${destroot}${install_prefix} -type f -and -name "*.py" ] {
+ reinplace "s|${pystringtoreplace}|${prefix}/bin/python${active_python_version}|g" $f
+ }
}
}
@@ -566,7 +585,7 @@
# ========================================================================================
set gcc_versions { 4.7 4.8 4.9 5 }
-set default_fortran_variant +gcc48
+set default_fortran_variant +gcc5
foreach gcc_ver ${gcc_versions} {
set gcc_ver_no_dot [join [split ${gcc_ver} "."] ""]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150731/a391b41c/attachment.html>
More information about the macports-changes
mailing list