Revision: 100785 https://trac.macports.org/changeset/100785 Author: takeshi@macports.org Date: 2012-12-24 05:06:34 -0800 (Mon, 24 Dec 2012) Log Message: ----------- omnixmp: revamped for 0.6.0. added gcc47 and mpich variants Modified Paths: -------------- trunk/dports/lang/omnixmp/Portfile trunk/dports/lang/omnixmp/files/patch-c-expr.c.diff trunk/dports/lang/omnixmp/files/patch-configure.diff trunk/dports/lang/omnixmp/files/patch-ompc_thread.c.diff Modified: trunk/dports/lang/omnixmp/Portfile =================================================================== --- trunk/dports/lang/omnixmp/Portfile 2012-12-24 11:52:07 UTC (rev 100784) +++ trunk/dports/lang/omnixmp/Portfile 2012-12-24 13:06:34 UTC (rev 100785) @@ -4,8 +4,7 @@ PortSystem 1.0 name omnixmp -version 0.5.4 -revision 3 +version 0.6.0 categories lang devel parallel maintainers takeshi description Omni OpenMP/XcalableMP Compiler @@ -14,16 +13,16 @@ Omni OpenMP/XcalableMP Compiler homepage http://www.xcalablemp.org/ platforms darwin -master_sites ${homepage}/xmp_files/ +master_sites sourceforge:xcalablemp -checksums rmd160 ba684fab05adccf0fa74eddfe676ca2bcbef3621 \ - sha256 234202058c4c214b99eeb0c434c466ddf1d18bbf3fc12e4170bcf764fd19ef18 +checksums rmd160 130f237976b5900dd251d614cdb7a1c551b4ecf3 \ + sha256 f8a877d7d3f1a4400b387c0b56528faf5493d77ec8414785959cd92774abc031 +use_bzip2 yes depends_lib port:flex \ port:gmp \ port:libxml2 -worksrcdir xmp-${version} patchfiles patch-configure.diff \ patch-ompc_thread.c.diff \ patch-c-expr.c.diff @@ -45,40 +44,50 @@ ln -s ${prefix}/lib/${name}/bin/xmpcc ${destroot}${prefix}/bin } -if {![variant_isset gcc44] && ![variant_isset gcc46]} { +if {![variant_isset gcc44] && ![variant_isset gcc46] && ![variant_isset gcc47]} { default_variants +gcc45 } -if {![variant_isset mpich2]} { +if {![variant_isset mpich2] && ![variant_isset mpich]} { default_variants +openmpi } use_parallel_build no -variant gcc44 conflicts gcc45 gcc46 description {use gfortran-mp-4.4 as backend fortran compiler} { +variant gcc44 conflicts gcc45 gcc46 gcc47 description {use gfortran-mp-4.4 as backend fortran compiler} { depends_lib-append port:gcc44 configure.compiler macports-gcc-4.4 } -variant gcc45 conflicts gcc44 gcc46 description {use gfortran-mp-4.5 as backend fortran compiler} { +variant gcc45 conflicts gcc44 gcc46 gcc47 description {use gfortran-mp-4.5 as backend fortran compiler} { depends_lib-append port:gcc45 configure.compiler macports-gcc-4.5 } -variant gcc46 conflicts gcc44 gcc45 description {use gfortran-mp-4.6 as backend fortran compiler} { +variant gcc46 conflicts gcc44 gcc45 gcc47 description {use gfortran-mp-4.6 as backend fortran compiler} { depends_lib-append port:gcc46 configure.compiler macports-gcc-4.6 } -variant openmpi conflicts mpich2 description {build with OpenMPI} { +variant gcc47 conflicts gcc44 gcc45 gcc46 description {use gfortran-mp-4.7 as backend fortran compiler} { + depends_lib-append port:gcc47 + configure.compiler macports-gcc-4.7 +} + +variant openmpi conflicts mpich2 mpich description {build with OpenMPI} { depends_lib-append port:openmpi configure.args-append --with-mpicc=${prefix}/lib/openmpi/bin/mpicc } -variant mpich2 conflicts openmpi description {build with MPICH2} { +variant mpich2 conflicts openmpi mpich description {build with MPICH2} { depends_lib-append port:mpich2 configure.args-append --with-mpicc=${prefix}/bin/mpicc } +variant mpich conflicts openmpi mpich2 description {build with MPICH3} { + depends_lib-append port:mpich + configure.args-append --with-mpicc=${prefix}/bin/mpicc +} + notes \ ${name} is installed in ${prefix}/lib/${name}. Modified: trunk/dports/lang/omnixmp/files/patch-c-expr.c.diff =================================================================== --- trunk/dports/lang/omnixmp/files/patch-c-expr.c.diff 2012-12-24 11:52:07 UTC (rev 100784) +++ trunk/dports/lang/omnixmp/files/patch-c-expr.c.diff 2012-12-24 13:06:34 UTC (rev 100785) @@ -1,6 +1,6 @@ ---- C-FrontEnd/src/c-expr.c.orig 2012-04-15 17:44:36.000000000 +0900 -+++ C-FrontEnd/src/c-expr.c 2012-04-15 17:46:18.000000000 +0900 -@@ -1309,7 +1309,7 @@ +--- C-FrontEnd/src/c-expr.c.orig 2012-11-14 00:28:58.000000000 +0900 ++++ C-FrontEnd/src/c-expr.c 2012-12-24 16:58:57.000000000 +0900 +@@ -1310,7 +1310,7 @@ int len = strlen(orgToken); char digits[len + 1]; Modified: trunk/dports/lang/omnixmp/files/patch-configure.diff =================================================================== --- trunk/dports/lang/omnixmp/files/patch-configure.diff 2012-12-24 11:52:07 UTC (rev 100784) +++ trunk/dports/lang/omnixmp/files/patch-configure.diff 2012-12-24 13:06:34 UTC (rev 100785) @@ -1,15 +1,15 @@ ---- configure.orig 2012-04-17 22:22:37.000000000 +0900 -+++ configure 2012-04-17 22:24:04.000000000 +0900 -@@ -5051,7 +5051,7 @@ - - chk=`$BECC --version | head -n1` - case $chk in --gcc*) -+*gcc* | *clang*) - OMC_CONF_LX2X_OPT="" - OMC_CONF_NTV_OPT="-std=gnu99 -Wno-implicit" - OMC_CONF_LNK_OPT="" -@@ -9229,7 +9229,7 @@ +--- configure.orig 2012-11-14 00:29:51.000000000 +0900 ++++ configure 2012-12-24 16:55:34.000000000 +0900 +@@ -5097,7 +5097,7 @@ + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in +- gcc) ++ *gcc* | *clang*) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; +@@ -9912,7 +9912,7 @@ # check size of mp_limb_t { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of GNU-MP mp_limb_t" >&5 $as_echo_n "checking size of GNU-MP mp_limb_t... " >&6; } @@ -18,7 +18,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lSz}" >&5 $as_echo "${lSz}" >&6; } omniLimbT="" -@@ -9254,7 +9254,7 @@ +@@ -9937,7 +9937,7 @@ # check how many mp_limb_t the GNU-MP needed for N bit precision. { $as_echo "$as_me:${as_lineno-$LINENO}: checking how many mp_limb_t needed for $omniQPrec bit precision" >&5 $as_echo_n "checking how many mp_limb_t needed for $omniQPrec bit precision... " >&6; } Modified: trunk/dports/lang/omnixmp/files/patch-ompc_thread.c.diff =================================================================== --- trunk/dports/lang/omnixmp/files/patch-ompc_thread.c.diff 2012-12-24 11:52:07 UTC (rev 100784) +++ trunk/dports/lang/omnixmp/files/patch-ompc_thread.c.diff 2012-12-24 13:06:34 UTC (rev 100785) @@ -1,6 +1,6 @@ ---- libompc/src/ompc_thread.c.orig 2012-04-15 17:29:40.000000000 +0900 -+++ libompc/src/ompc_thread.c 2012-04-15 17:30:52.000000000 +0900 -@@ -262,11 +262,11 @@ +--- libompc/src/ompc_thread.c.orig 2012-11-14 00:29:29.000000000 +0900 ++++ libompc/src/ompc_thread.c 2012-12-24 21:43:40.000000000 +0900 +@@ -263,11 +263,11 @@ */ ompc_max_threads = ompc_num_threads;