Revision: 108595 https://trac.macports.org/changeset/108595 Author: takeshi@macports.org Date: 2013-07-27 00:36:24 -0700 (Sat, 27 Jul 2013) Log Message: ----------- omnixmp: revamped for 0.6.1. added gcc48 variant Modified Paths: -------------- trunk/dports/lang/omnixmp/Portfile trunk/dports/lang/omnixmp/files/patch-configure.diff Added Paths: ----------- trunk/dports/lang/omnixmp/files/patch-libxmpf-Makefile.in.diff Modified: trunk/dports/lang/omnixmp/Portfile =================================================================== --- trunk/dports/lang/omnixmp/Portfile 2013-07-27 07:26:09 UTC (rev 108594) +++ trunk/dports/lang/omnixmp/Portfile 2013-07-27 07:36:24 UTC (rev 108595) @@ -4,20 +4,19 @@ PortSystem 1.0 name omnixmp -version 0.6.0 -revision 2 +version 0.6.1 categories lang devel parallel maintainers takeshi description Omni OpenMP/XcalableMP Compiler license LGPL-2.1 long_description \ Omni OpenMP/XcalableMP Compiler -homepage http://www.xcalablemp.org/ +homepage http://www.hpcs.cs.tsukuba.ac.jp/omni-compiler/xcalablemp/ platforms darwin master_sites sourceforge:xcalablemp -checksums rmd160 130f237976b5900dd251d614cdb7a1c551b4ecf3 \ - sha256 f8a877d7d3f1a4400b387c0b56528faf5493d77ec8414785959cd92774abc031 +checksums rmd160 28d2770d1dc93338ce99a6e07730d55424d1002f \ + sha256 7f76040a3302dcaf84633d6a7aa076ffc9f2a2e32711d3fe69f2ff0d1899900f use_bzip2 yes depends_lib port:flex \ @@ -26,7 +25,8 @@ patchfiles patch-configure.diff \ patch-ompc_thread.c.diff \ - patch-c-expr.c.diff + patch-c-expr.c.diff \ + patch-libxmpf-Makefile.in.diff post-patch { if {${build_arch}=="x86_64"} { @@ -45,7 +45,7 @@ ln -s ${prefix}/lib/${name}/bin/xmpcc ${destroot}${prefix}/bin } -if {![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46]} { +if {![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc48]} { default_variants +gcc47 } @@ -55,26 +55,31 @@ use_parallel_build no -variant gcc44 conflicts gcc45 gcc46 gcc47 description {use gfortran-mp-4.4 as backend fortran compiler} { +variant gcc44 conflicts gcc45 gcc46 gcc47 gcc48 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 gcc47 description {use gfortran-mp-4.5 as backend fortran compiler} { +variant gcc45 conflicts gcc44 gcc46 gcc47 gcc48 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 gcc47 description {use gfortran-mp-4.6 as backend fortran compiler} { +variant gcc46 conflicts gcc44 gcc45 gcc47 gcc48 description {use gfortran-mp-4.6 as backend fortran compiler} { depends_lib-append port:gcc46 configure.compiler macports-gcc-4.6 } -variant gcc47 conflicts gcc44 gcc45 gcc46 description {use gfortran-mp-4.7 as backend fortran compiler} { +variant gcc47 conflicts gcc44 gcc45 gcc46 gcc48 description {use gfortran-mp-4.7 as backend fortran compiler} { depends_lib-append port:gcc47 configure.compiler macports-gcc-4.7 } +variant gcc48 conflicts gcc44 gcc45 gcc46 gcc47 description {use gfortran-mp-4.8 as backend fortran compiler} { + depends_lib-append port:gcc48 + configure.compiler macports-gcc-4.8 +} + variant openmpi conflicts mpich description {build with OpenMPI} { depends_lib-append port:openmpi configure.args-append --with-mpicc=${prefix}/lib/openmpi/bin/mpicc Modified: trunk/dports/lang/omnixmp/files/patch-configure.diff =================================================================== --- trunk/dports/lang/omnixmp/files/patch-configure.diff 2013-07-27 07:26:09 UTC (rev 108594) +++ trunk/dports/lang/omnixmp/files/patch-configure.diff 2013-07-27 07:36:24 UTC (rev 108595) @@ -1,5 +1,5 @@ ---- configure.orig 2012-11-14 00:29:51.000000000 +0900 -+++ configure 2012-12-24 16:55:34.000000000 +0900 +--- configure.orig 2013-07-27 16:01:41.000000000 +0900 ++++ configure 2013-07-27 16:03:56.000000000 +0900 @@ -5097,7 +5097,7 @@ am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" @@ -9,7 +9,7 @@ # This depmode causes a compiler race in universal mode. test "$am__universal" = false || continue ;; -@@ -9912,7 +9912,7 @@ +@@ -9925,7 +9925,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="" -@@ -9937,7 +9937,7 @@ +@@ -9950,7 +9950,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; } Added: trunk/dports/lang/omnixmp/files/patch-libxmpf-Makefile.in.diff =================================================================== --- trunk/dports/lang/omnixmp/files/patch-libxmpf-Makefile.in.diff (rev 0) +++ trunk/dports/lang/omnixmp/files/patch-libxmpf-Makefile.in.diff 2013-07-27 07:36:24 UTC (rev 108595) @@ -0,0 +1,13 @@ +--- libxmpf/src/Makefile.in.orig 2013-07-27 16:21:43.000000000 +0900 ++++ libxmpf/src/Makefile.in 2013-07-27 16:23:40.000000000 +0900 +@@ -610,8 +610,8 @@ + @MPI_F90@ -c xmpf_main.f + + install-exec-local: xmpf_main.o +- test -z $(libdir) || /bin/mkdir -p $(libdir) +- $(INSTALL_DATA) xmpf_main.o $(libdir) ++ test -z $(libdir) || /bin/mkdir -p $(DESTDIR)$(libdir) ++ $(INSTALL_DATA) xmpf_main.o $(DESTDIR)$(libdir) + + clean-local: + rm -f *~ *.core core core.*