<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7792b2c5655f9d2adb979434a242cc3ac60fea40">https://github.com/macports/macports-ports/commit/7792b2c5655f9d2adb979434a242cc3ac60fea40</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7792b2c5655f9d2adb979434a242cc3ac60fea40
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Jun 15 17:47:17 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> root6: Update to 6.10.00
</span>---
science/root6/Portfile | 25 ++++++++----
.../root6/files/patch-disable-hsimple-macro.diff | 45 ++++++++++++++++++++++
2 files changed, 62 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/root6/Portfile b/science/root6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 72e935f..8e1ecec 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/root6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/root6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,9 @@ depends_lib port:expat \
</span> port:pcre \
port:tiff \
port:zlib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gl2ps \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tbb
</span> # port:freetype
depends_run port:root_select
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,6 +70,10 @@ compiler.whitelist clang macports-clang-3.9 macports-clang-3.8
</span> # port specific location
set install_prefix ${prefix}/libexec/root${version_major}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch to disable hsimple macro running during build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# To be removed once MacPorts allows access to /dev/random in the build sandbox.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-disable-hsimple-macro.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
-Dgnuinstall=ON \
-Drpath=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,6 +87,7 @@ configure.args-append \
</span> -Dbuiltin_pcre=OFF \
-Dbuiltin_zlib=OFF \
-Dbuiltin_lzma=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dbuiltin_tbb=OFF \
</span> -Dbuiltin_afterimage=ON \
-Dfftw3=OFF \
-Dkrb5=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,7 +148,7 @@ platform darwin {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note that we are forcing this choice. This means that anything linking
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note that we are forcing this choice. This means that anything linking
</span> # against root6 needs to also be using libc++. This is possibly
# problematic, but luckily there is just a limited set of such dependents.
# Another problem is that all dependencies might need to be built-in
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -172,7 +179,7 @@ platform darwin {
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Temporary - Set execute flag on binaries (broken in 6.06.00)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set execute flag on binaries (broken in 6.06.00)
</span> foreach f [glob -directory ${destroot}${install_prefix}/bin *] {
system "chmod +x $f"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -230,7 +237,7 @@ post-activate {
</span>
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +cocoa +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion +http +cxx14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +cocoa +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion +http +cxx17
</span>
variant qt4 description {Enable QT4 support} {
configure.args-replace -Dqt=OFF -Dqt=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -352,7 +359,7 @@ variant opengl description {Build with opengl support} {
</span> # ========================================================================================
# List of possible python versions
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_versions { 2.6 2.7 3.3 3.4 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_versions { 2.6 2.7 3.3 3.4 3.5 3.6 }
</span> set default_python_variant +python27
# Define the available variants
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -408,7 +415,7 @@ foreach py_ver ${python_versions} {
</span> } elseif { [ file exists "${prefix}/lib/libpython${py_ver}.dylib" ] } {
configure.args-append -DPYTHON_LIBRARY="${prefix}/lib/libpython${py_ver}.dylib"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python${py_ver_no_dot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python${py_ver_no_dot} port:py${py_ver_no_dot}-numpy
</span>
post-destroot {
# Install PyROOT lib in the correct place
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -547,7 +554,8 @@ variant x11 conflicts cocoa description {Enables X11 graphical backend} {
</span> # ========================================================================================
# List of possible clang versions that work
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set clang_versions { 3.8 3.9 4.0 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# REMEMBER - Update the logic below when changing this list ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set clang_versions { 3.8 3.9 }
</span>
# Define the available variants
foreach clang_ver ${clang_versions} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -597,7 +605,7 @@ if { ${active_clang_variant} != "" } {
</span> # Note that g95 does not work here, so that variant is removed
# ========================================================================================
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set gcc_versions { 4.7 4.8 4.9 5 6 7 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set gcc_versions { 4.9 5 6 7 }
</span> set default_fortran_variant +gcc6
foreach gcc_ver ${gcc_versions} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -638,6 +646,7 @@ foreach gcc_ver ${gcc_versions} {
</span> configure.fc ${prefix}/bin/gfortran-mp-${gcc_ver}
configure.f77 ${prefix}/bin/gfortran-mp-${gcc_ver}
configure.f90 ${prefix}/bin/gfortran-mp-${gcc_ver}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DCMAKE_Fortran_COMPILER=${prefix}/bin/gfortran-mp-${gcc_ver}
</span>
configure.args-replace -Dfortran=OFF -Dfortran=ON
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/root6/files/patch-disable-hsimple-macro.diff b/science/root6/files/patch-disable-hsimple-macro.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c47e550
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/root6/files/patch-disable-hsimple-macro.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.original.txt 2017-06-14 09:49:07.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2017-06-14 09:51:10.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -294,24 +294,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/dictpch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #---hsimple.root---------(use the executable for clearer dependencies and proper return code)---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-add_dependencies(hsimple onepcm)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_custom_command(OUTPUT tutorials/hsimple.root
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set ROOTIGNOREPREFIX=1 &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- WORKING_DIRECTORY tutorials
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEPENDS $<TARGET_FILE:root.exe> Cling Hist Tree Gpad Graf HistPainter move_artifacts)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_custom_command(OUTPUT tutorials/hsimple.root
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ROOTIGNOREPREFIX=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- WORKING_DIRECTORY tutorials
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEPENDS $<TARGET_FILE:root.exe> Cling Hist Tree Gpad Graf HistPainter move_artifacts)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#add_dependencies(hsimple onepcm)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# add_custom_command(OUTPUT tutorials/hsimple.root
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# set ROOTIGNOREPREFIX=1 &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# WORKING_DIRECTORY tutorials
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# DEPENDS $<TARGET_FILE:root.exe> Cling Hist Tree Gpad Graf HistPainter move_artifacts)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# add_custom_command(OUTPUT tutorials/hsimple.root
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ROOTIGNOREPREFIX=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# WORKING_DIRECTORY tutorials
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# DEPENDS $<TARGET_FILE:root.exe> Cling Hist Tree Gpad Graf HistPainter move_artifacts)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #---version--------------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_custom_target(version COMMAND ${CMAKE_SOURCE_DIR}/build/unix/makeversion.sh ${CMAKE_BINARY_DIR}
</span></pre><pre style='margin:0'>
</pre>