[127783] trunk/dports
ryandesign at macports.org
ryandesign at macports.org
Mon Nov 3 18:40:54 PST 2014
Revision: 127783
https://trac.macports.org/changeset/127783
Author: ryandesign at macports.org
Date: 2014-11-03 18:40:54 -0800 (Mon, 03 Nov 2014)
Log Message:
-----------
pure, pure-docs: update to 0.64 (#45733)
Modified Paths:
--------------
trunk/dports/lang/pure/Portfile
trunk/dports/pure/pure-docs/Portfile
Added Paths:
-----------
trunk/dports/lang/pure/files/pure-0.64-ats-hotfixes.diff
Modified: trunk/dports/lang/pure/Portfile
===================================================================
--- trunk/dports/lang/pure/Portfile 2014-11-04 02:27:27 UTC (rev 127782)
+++ trunk/dports/lang/pure/Portfile 2014-11-04 02:40:54 UTC (rev 127783)
@@ -5,7 +5,7 @@
PortGroup bitbucket 1.0
# Keep the versions of pure and pure-docs in sync.
-bitbucket.setup purelang pure-lang 0.63 pure-
+bitbucket.setup purelang pure-lang 0.64 pure-
name pure
categories lang
platforms darwin
@@ -32,8 +32,8 @@
bitbucket.tarball_from downloads
distname ${name}-${version}
-checksums rmd160 6f2d3e0da2ee58d09e9c628d7297610445c6f8a9 \
- sha256 33acb2d560b21813f5e856973b493d9cfafba82bd6f539425ce07aa22f84ee29
+checksums rmd160 fa5d57b94fad999ada281edaf30db4212a0a28ae \
+ sha256 efd55229342aec9d79e8fa4732a30f140e1773064f3869abde053e01468f7b07
set llvm_version 3.4
set llvm_prefix ${prefix}/libexec/llvm-${llvm_version}
@@ -63,6 +63,9 @@
# Prevent build failure when old llvm port is installed
configure.cppflags -I${llvm_prefix}/include ${configure.cppflags}
configure.ldflags -L${llvm_prefix}/lib ${configure.ldflags}
+
+ # Last-minute fixes to the ATS inlining support
+ patchfiles-append pure-0.64-ats-hotfixes.diff
platform macosx {
depends_run-replace port:w3m port:openbrowser
@@ -86,6 +89,11 @@
${docdir}
copy ${destroot.dir}/examples ${destroot}${prefix}/share/examples/${name}
}
+
+ variant pcre description {Replace POSIX regular expression support with PCRE support} {
+ depends_lib-append port:pcre
+ configure.args-append --with-pcre
+ }
test.run yes
test.target check
Added: trunk/dports/lang/pure/files/pure-0.64-ats-hotfixes.diff
===================================================================
--- trunk/dports/lang/pure/files/pure-0.64-ats-hotfixes.diff (rev 0)
+++ trunk/dports/lang/pure/files/pure-0.64-ats-hotfixes.diff 2014-11-04 02:40:54 UTC (rev 127783)
@@ -0,0 +1,74 @@
+diff -r 0606383af4b0 pure/interpreter.cc
+--- interpreter.cc Wed Oct 29 00:02:26 2014 +0100
++++ interpreter.cc Sat Nov 01 18:23:46 2014 +0100
+@@ -2586,8 +2586,10 @@
+ Fortran.
+
+ - "-*- ats -*-" selects ATS (PURE_ATSCC environment variable, patscc by
+- default). Contributed by Barry Schwartz <sortsmill at crudfactory.com>, see
+- http://www.ats-lang.org/.
++ default). You can also set the C compiler to be used by patscc with the
++ PURE_ATSCCOMP environment variable (either clang or gcc by default,
++ depending on the value of PURE_ATSCC). Contributed by Barry Schwartz
++ <sortsmill at crudfactory.com>, see http://www.ats-lang.org/.
+
+ - "-*- dsp:name -*-" selects Faust (PURE_FAUST environment variable, faust
+ by default), where 'name' denotes the name of the Faust dsp, which is
+@@ -2685,28 +2687,39 @@
+ } else if (tag == "ats") {
+ env = "PURE_ATSCC";
+ // The default command is for ATS2-Postiats, which uses gcc as its C
+- // compiler by default. We prefer to use clang instead (set by means of
+- // the PATSCCOMP environment variable). If you have a working dragonegg
+- // plugin installed, you can still override this by setting the PURE_ATSCC
+- // variable to 'patscc -fplugin=dragonegg'. NOTE: In any case you should
+- // set the PATSHOME environment variable as explained in the ATS2
+- // installation instructions.
++ // compiler by default. We prefer to use clang instead. If you have a
++ // working dragonegg plugin installed, you can still override this by
++ // setting the PURE_ATSCC variable to 'patscc -fplugin=dragonegg'. NOTE:
++ // In any case you should set the PATSHOME environment variable as
++ // explained in the ATS2 installation instructions.
+ drv = "patscc";
+- args = " -emit-llvm -c ";
+ ext = ".dats";
+ intermediate_ext = "_dats.c";
+ remove_intermediate = true;
+- // We only override patscc's default C compiler if neither PURE_ATSCC nor
+- // PATSCCOMP has been set, so that the user still has full control over
+- // which AST and C compilers will be used.
+- if (!getenv("PURE_ATSCC") && !getenv("PATSCCOMP")) {
+- static char *patsccomp = NULL;
+- if (!patsccomp) {
+- string ccomp = string("PATSCCOMP=") + clang + " -emit-llvm -std=c99 -D_XOPEN_SOURCE -I${PATSHOME} -I${PATSHOME}/ccomp/runtime";
+- patsccomp = strdup(ccomp.c_str());
+- putenv(patsccomp);
+- }
+- args = " -c ";
++ // Unless dragonegg is being used or PURE_ATSCCOMP has been set
++ // explicitly, we override patscc's default C compiler so that clang is
++ // used to generate bitcode. If needed, this gives the user full control
++ // over which AST and C compilers will be used, and the options they
++ // should be invoked with. The options needed for bitcode compilation are
++ // always added, however.
++ char *atscc = getenv(env);
++ char *atsccomp = getenv("PURE_ATSCCOMP");
++ // Figure out the default C compiler to use and set up command line
++ // arguments accordingly.
++ string cc = clang+ " -emit-llvm";
++ args = " -atsccomp \"${PURE_ATSCCOMP}\" -c ";
++ if (atscc && strstr(atscc, "dragonegg")) {
++ // Use dragonegg instead.
++ cc = "gcc";
++ args = " -atsccomp \"${PURE_ATSCCOMP}\" -emit-llvm -c ";
++ }
++ if (!atsccomp) {
++ // Set up a reasonable default for the PURE_ATSCCOMP variable.
++ string ccomp = string("PURE_ATSCCOMP=") + cc + " -std=c99 -D_XOPEN_SOURCE -I${PATSHOME} -I${PATSHOME}/ccomp/runtime";
++ atsccomp = strdup(ccomp.c_str());
++ putenv(atsccomp);
++ bool vflag = (verbose&verbosity::compiler) != 0;
++ if (vflag) std::cerr << atsccomp << '\n';
+ }
+ } else if (tag == "dsp") {
+ env = "PURE_FAUST"; drv = "faust -double";
Modified: trunk/dports/pure/pure-docs/Portfile
===================================================================
--- trunk/dports/pure/pure-docs/Portfile 2014-11-04 02:27:27 UTC (rev 127782)
+++ trunk/dports/pure/pure-docs/Portfile 2014-11-04 02:40:54 UTC (rev 127783)
@@ -5,7 +5,7 @@
PortGroup pure 1.0
# Keep the versions of pure and pure-docs in sync.
-pure.setup docs 0.63
+pure.setup docs 0.64
categories-append lang
platforms darwin
maintainers ryandesign gmail.com:aggraef
@@ -17,8 +17,8 @@
long_description ${name} is an offline copy of the ${description}.
-checksums rmd160 55698d8c47c52c088446f5b32c2304c5c1f4414c \
- sha256 fbb6933e35d321b3531343263e6af0cae92c86c56bcb1870b416a7c5e046456c
+checksums rmd160 78fa7d656527538c1053dfc46238e6643554fd85 \
+ sha256 a140456f7d6feff8a15f5505a8fa3f9376afef88f1831ca98b93dc1d1764d110
platform macosx {
patchfiles patch-openbrowser.diff
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141103/3de530a8/attachment.html>
More information about the macports-changes
mailing list