<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[128619] trunk/dports/lang</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/128619">128619</a></dd>
<dt>Author</dt> <dd>takeshi@macports.org</dd>
<dt>Date</dt> <dd>2014-11-24 04:36:45 -0800 (Mon, 24 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>omnicompiler: update to 0.9, change its name from omnixmp. add support for coarray using GASNet</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangomnicompilerPortfile">trunk/dports/lang/omnicompiler/Portfile</a></li>
<li><a href="#trunkdportslangomnicompilerfilespatchconfigurediff">trunk/dports/lang/omnicompiler/files/patch-configure.diff</a></li>
<li><a href="#trunkdportslangomnixmpPortfile">trunk/dports/lang/omnixmp/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/lang/omnicompiler/</li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportslangomnicompilerfilespatchcexprcdiff">trunk/dports/lang/omnicompiler/files/patch-c-expr.c.diff</a></li>
<li><a href="#trunkdportslangomnicompilerfilespatchlibxmpfMakefileindiff">trunk/dports/lang/omnicompiler/files/patch-libxmpf-Makefile.in.diff</a></li>
<li><a href="#trunkdportslangomnicompilerfilespatchompc_threadcdiff">trunk/dports/lang/omnicompiler/files/patch-ompc_thread.c.diff</a></li>
<li>trunk/dports/lang/omnixmp/files/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangomnicompilerPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/omnicompiler/Portfile (128482 => 128619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/omnixmp/Portfile 2014-11-22 04:12:05 UTC (rev 128482)
+++ trunk/dports/lang/omnicompiler/Portfile 2014-11-24 12:36:45 UTC (rev 128619)
</span><span class="lines">@@ -4,69 +4,82 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup mpi 1.0
</span><span class="cx">
</span><del>-name omnixmp
-version 0.6.1
-revision 1
</del><ins>+name omnicompiler
+version 0.9
</ins><span class="cx"> categories lang devel parallel
</span><span class="cx"> maintainers takeshi openmaintainer
</span><del>-description Omni OpenMP/XcalableMP Compiler
</del><ins>+description code transformation compilers for C, Fortran and OpenACC
</ins><span class="cx"> license LGPL-2.1
</span><span class="cx"> long_description \
</span><del>- Omni OpenMP/XcalableMP Compiler
-homepage http://www.hpcs.cs.tsukuba.ac.jp/omni-compiler/xcalablemp/
</del><ins>+ Omni compiler is a collection of programs and libraries \
+ that allow users to build code transformation compilers. \
+ Omni Compiler is to translate C and Fortran programs \
+ with XcalableMP and/or OpenACC directives into parallel code \
+ suitable for compiling with a native compiler \
+ linked with the Omni Compiler runtime library.
+homepage http://omni-compiler.org
</ins><span class="cx"> platforms darwin
</span><span class="cx"> master_sites sourceforge:xcalablemp
</span><span class="cx">
</span><del>-checksums rmd160 28d2770d1dc93338ce99a6e07730d55424d1002f \
- sha256 7f76040a3302dcaf84633d6a7aa076ffc9f2a2e32711d3fe69f2ff0d1899900f
</del><ins>+checksums rmd160 94c68eeeebd65e41098c0cb7facdfba59c1e7868 \
+ sha256 1d978c918693aabf34d4bf4b4f43e3e91c09ac4bc88a69e8974715e36bcc086f
</ins><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-mpi.choose
-mpi.setup require_fortran -clang -dragonegg -fortran
</del><ins>+mpi.choose cc fc
+mpi.setup require -clang -dragonegg -g95 -gfortran -llvm
+if {[variant_isset coarray]} {
+ mpi.enforce_variant GASNet
+}
</ins><span class="cx">
</span><del>-depends_build port:apache-ant
-depends_lib port:flex \
- port:gmp \
</del><ins>+depends_build port:apache-ant \
+ port:bison \
+ port:flex \
+ port:coreutils
+depends_lib port:gmp \
</ins><span class="cx"> port:libxml2
</span><span class="cx">
</span><del>-patchfiles patch-configure.diff \
- patch-ompc_thread.c.diff \
- patch-c-expr.c.diff \
- patch-libxmpf-Makefile.in.diff
</del><ins>+patchfiles patch-configure.diff
+# GNU mktemp rather than BSD mktemp is assumed
+post-patch {
+ reinplace "s|mktemp|${prefix}/bin/gmktemp|" ${worksrcpath}/Makefile.in
+ foreach f {acc xmp xmpf} {
+ reinplace "s|lib64|lib|" ${worksrcpath}/Driver/etc/linker.conf.${f}.in
+ }
+}
</ins><span class="cx">
</span><span class="cx"> use_parallel_build no
</span><span class="cx">
</span><ins>+set mpi [mpi_variant_name]
+set cmp [gcc_variant_name]
+if {${cmp} == ""} {
+ set cmp mp
+}
</ins><span class="cx"> configure.args --prefix=${prefix}/lib/${name} \
</span><ins>+ --disable-dependency-tracking \
</ins><span class="cx"> --disable-xmpgpu \
</span><del>- --with-gmpLibDir=${prefix}/lib \
- --with-gmpIncDir=${prefix}/include \
- --with-cflag=${configure.cflags} \
- --with-cppflag="${configure.cppflags} -I${prefix}/include/libxml2 -I/usr/include -DSIMPLE_SPIN"
</del><ins>+ --with-cppflag=${configure.cppflags} \
+ --with-backend-cc=${prefix}/bin/mpicc-${mpi}-${cmp} \
+ --with-backend-cflag=${configure.cflags} \
+ --with-backend-fc=${prefix}/bin/mpif90-${mpi}-${cmp} \
+ --enable-mreal \
+ --with-gmp-lib=${prefix}/lib \
+ --with-gmp-include=${prefix}/include \
+ --with-libxml=${prefix}
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><del>- if {${build_arch} eq "x86_64"} {
- reinplace "s|CPU=i386|CPU=x86_64|g" ${worksrcpath}/configure
- }
</del><span class="cx"> }
</span><span class="cx">
</span><del>-post-destroot {
- ln -s ${prefix}/lib/${name}/bin/xmpcc ${destroot}${prefix}/bin
</del><ins>+variant coarray description {enable support for Coarray} {
+ depends_build-append port:GASNet
+ configure.args-append --with-gasnet=${prefix} \
+ --with-gasnet-conduit=mpi
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-if {![fortran_variant_isset]} {
- default_variants-append +gcc48
-}
</del><ins>+#variant openacc description {enable support for OpenACC (requires CUDA installation at /usr/local/cuda)} {
+# configure.args-append --enable-openacc \
+# --with-gpucc=/usr/local/cuda/bin/nvcc \
+# --with-cuda=/usr/local/cuda
+#}
</ins><span class="cx">
</span><del>-if {![mpi_variant_isset]} {
- default_variants-append +mpich
-}
-
-pre-configure {
- if {[mpi_variant_isset]} {
- configure.args-append --with-mpicc=${mpi.cc} \
- --with-mpif90=${mpi.fc}
- }
-}
-
</del><span class="cx"> notes \
</span><span class="cx"> ${name} is installed in ${prefix}/lib/${name}.
</span></span></pre></div>
<a id="trunkdportslangomnicompilerfilespatchcexprcdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/omnicompiler/files/patch-c-expr.c.diff (128482 => 128619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/omnixmp/files/patch-c-expr.c.diff 2014-11-22 04:12:05 UTC (rev 128482)
+++ trunk/dports/lang/omnicompiler/files/patch-c-expr.c.diff 2014-11-24 12:36:45 UTC (rev 128619)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- 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];
-
-- if(orgToken[0] == '0') {
-+ if(orgToken[0] == '0' && len > 2) {
- char c = orgToken[1];
- if(c == 'x' || c == 'X' || c == 'b' || c == 'B')
- strcpy(digits, orgToken + 2); // hex, bin
</del></span></pre></div>
<a id="trunkdportslangomnicompilerfilespatchconfigurediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/omnicompiler/files/patch-configure.diff (128482 => 128619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/omnixmp/files/patch-configure.diff 2014-11-22 04:12:05 UTC (rev 128482)
+++ trunk/dports/lang/omnicompiler/files/patch-configure.diff 2014-11-24 12:36:45 UTC (rev 128619)
</span><span class="lines">@@ -1,29 +1,11 @@
</span><del>---- 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"
- case $depmode in
-- gcc)
-+ *gcc* | *clang*)
- # This depmode causes a compiler race in universal mode.
- test "$am__universal" = false || continue
- ;;
-@@ -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; }
-- lSz=`qcCC utils/csMPlimb.c ./csMPlimb`
-+ lSz=`qcCC buildutils/csMPlimb.c ./csMPlimb`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lSz}" >&5
- $as_echo "${lSz}" >&6; }
- omniLimbT=""
-@@ -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; }
-- omniQRealPrecInLimb=`qcCC utils/cMPlb.c ./cMPlb '' $omniQPrec`
-+ omniQRealPrecInLimb=`qcCC buildutils/cMPlb.c ./cMPlb '' $omniQPrec`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $omniQRealPrecInLimb" >&5
- $as_echo "$omniQRealPrecInLimb" >&6; }
- cat >>confdefs.h <<_ACEOF
</del><ins>+--- configure.orig 2014-11-23 10:17:23.000000000 +0900
++++ configure 2014-11-23 18:50:34.000000000 +0900
+@@ -25150,7 +25150,7 @@
+ $as_echo "can't find ${gmpInclude}/gmp.h. exit." >&6; }
+ exit 1
+ fi
+- gmpLibs=`ls ${gmpInclude}/libgmp.* 2> /dev/null`
++ gmpLibs=`ls ${gmpLib}/libgmp.* 2> /dev/null`
+ if test "x${gmpLibs}" = "x"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: can't find ${gmpLib}/libgmp.*. exit." >&5
+ $as_echo "can't find ${gmpLib}/libgmp.*. exit." >&6; }
</ins></span></pre></div>
<a id="trunkdportslangomnicompilerfilespatchlibxmpfMakefileindiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/omnicompiler/files/patch-libxmpf-Makefile.in.diff (128482 => 128619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/omnixmp/files/patch-libxmpf-Makefile.in.diff 2014-11-22 04:12:05 UTC (rev 128482)
+++ trunk/dports/lang/omnicompiler/files/patch-libxmpf-Makefile.in.diff 2014-11-24 12:36:45 UTC (rev 128619)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>---- 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.*
</del></span></pre></div>
<a id="trunkdportslangomnicompilerfilespatchompc_threadcdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/omnicompiler/files/patch-ompc_thread.c.diff (128482 => 128619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/omnixmp/files/patch-ompc_thread.c.diff 2014-11-22 04:12:05 UTC (rev 128482)
+++ trunk/dports/lang/omnicompiler/files/patch-ompc_thread.c.diff 2014-11-24 12:36:45 UTC (rev 128619)
</span><span class="lines">@@ -1,16 +0,0 @@
</span><del>---- 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;
-
--#ifdef USE_PTHREAD
-+#ifdef USE_PTHREAD_BARRIER
- pthread_barrier_init(&ompc_thd_bar, 0, ompc_num_threads);
- #endif
-
--#if defined(OMNI_OS_IRIX) && defined(USE_PTHREAD)
-+#if (defined(OMNI_OS_IRIX) || defined(OMNI_OS_DARWIN)) && defined(USE_PTHREAD)
- pthread_setconcurrency(ompc_max_threads);
- #endif /* OMNI_OS_IRIX && USE_PTHREAD */
-
</del></span></pre></div>
<a id="trunkdportslangomnixmpPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/omnixmp/Portfile (128618 => 128619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/omnixmp/Portfile 2014-11-24 12:25:50 UTC (rev 128618)
+++ trunk/dports/lang/omnixmp/Portfile 2014-11-24 12:36:45 UTC (rev 128619)
</span><span class="lines">@@ -2,71 +2,14 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup mpi 1.0
</del><span class="cx">
</span><ins>+# This port can be removed after 24 November 2015
+replaced_by omnicompiler
+PortGroup obsolete 1.0
+
</ins><span class="cx"> name omnixmp
</span><span class="cx"> version 0.6.1
</span><span class="cx"> revision 1
</span><span class="cx"> categories lang devel parallel
</span><del>-maintainers takeshi openmaintainer
-description Omni OpenMP/XcalableMP Compiler
</del><span class="cx"> license LGPL-2.1
</span><del>-long_description \
- Omni OpenMP/XcalableMP Compiler
</del><span class="cx"> homepage http://www.hpcs.cs.tsukuba.ac.jp/omni-compiler/xcalablemp/
</span><del>-platforms darwin
-master_sites sourceforge:xcalablemp
-
-checksums rmd160 28d2770d1dc93338ce99a6e07730d55424d1002f \
- sha256 7f76040a3302dcaf84633d6a7aa076ffc9f2a2e32711d3fe69f2ff0d1899900f
-use_bzip2 yes
-
-mpi.choose
-mpi.setup require_fortran -clang -dragonegg -fortran
-
-depends_build port:apache-ant
-depends_lib port:flex \
- port:gmp \
- port:libxml2
-
-patchfiles patch-configure.diff \
- patch-ompc_thread.c.diff \
- patch-c-expr.c.diff \
- patch-libxmpf-Makefile.in.diff
-
-use_parallel_build no
-
-configure.args --prefix=${prefix}/lib/${name} \
- --disable-xmpgpu \
- --with-gmpLibDir=${prefix}/lib \
- --with-gmpIncDir=${prefix}/include \
- --with-cflag=${configure.cflags} \
- --with-cppflag="${configure.cppflags} -I${prefix}/include/libxml2 -I/usr/include -DSIMPLE_SPIN"
-
-post-patch {
- if {${build_arch} eq "x86_64"} {
- reinplace "s|CPU=i386|CPU=x86_64|g" ${worksrcpath}/configure
- }
-}
-
-post-destroot {
- ln -s ${prefix}/lib/${name}/bin/xmpcc ${destroot}${prefix}/bin
-}
-
-if {![fortran_variant_isset]} {
- default_variants-append +gcc48
-}
-
-if {![mpi_variant_isset]} {
- default_variants-append +mpich
-}
-
-pre-configure {
- if {[mpi_variant_isset]} {
- configure.args-append --with-mpicc=${mpi.cc} \
- --with-mpif90=${mpi.fc}
- }
-}
-
-notes \
- ${name} is installed in ${prefix}/lib/${name}.
</del></span></pre>
</div>
</div>
</body>
</html>