<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/447b15c08cc80fecdc1ebe790befd92ce413fc6b">https://github.com/macports/macports-ports/commit/447b15c08cc80fecdc1ebe790befd92ce413fc6b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 447b15c guile: version upgrade 2.0.14->2.2.2
</span>447b15c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 447b15c08cc80fecdc1ebe790befd92ce413fc6b
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed May 3 13:11:33 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> guile: version upgrade 2.0.14->2.2.2
</span>---
lang/guile/Portfile | 11 ++++-----
...sierra-filter-incompatible-mkostemp-flags.patch | 28 ----------------------
lang/guile/files/sierra.patch | 25 -------------------
3 files changed, 4 insertions(+), 60 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/guile/Portfile b/lang/guile/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 738d144..2db499c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/guile/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/guile/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
name guile
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.0.14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#revision 0
</span> categories lang
maintainers nomaintainer
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,8 +35,8 @@ distname guile-${version}
</span> homepage http://www.gnu.org/software/guile/guile.html
master_sites gnu
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 754aaf1bf3c6bed9afdde49c5154b87047408a1e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8aeb2f353881282fe01694cce76bb72f7ffdd296a12c7a1a39255c27b0dfe5f1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1299dac3a5c218b6aebd7471c6562a9ad7825edc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3d9b94183b19f04dd4317da87beedafd1c947142f3d861ca1f0224e7a75127ee
</span>
depends_lib port:readline \
port:gettext \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,9 +59,6 @@ configure.args CPPFLAGS="-I${prefix}/include" \
</span> --disable-error-on-warning \
--disable-silent-rules
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles sierra.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sierra-filter-incompatible-mkostemp-flags.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Unable to cross compile, so we need to be able to run the built code
if {${os.arch} eq "i386" && ${os.major} >= 11} {
supported_archs i386 x86_64
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/guile/files/sierra-filter-incompatible-mkostemp-flags.patch b/lang/guile/files/sierra-filter-incompatible-mkostemp-flags.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cde2def..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/guile/files/sierra-filter-incompatible-mkostemp-flags.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Filter incompat. mkostemp(3) flags on macOS 10.12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-macOS Sierra introduces a mkostemp(3) function which is used when
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-present. Contrary to the GNUlib version of mkostemp(3) that was used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-previously, this version fails with 'invalid argument' when flags other
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-than from a specified set are passed. From mktemp(3):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-| The mkostemp() function is like mkstemp() but allows specifying
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-| additional open(2) flags (defined in <fcntl.h>). The permitted flags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-| are O_APPEND, O_SHLOCK, O_EXLOCK and O_CLOEXEC.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Clemens Lang <cal@macports.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Submitted [https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24862#23]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libguile/filesys.c.orig 2017-01-09 00:53:27.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libguile/filesys.c 2017-01-09 00:54:48.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1486,6 +1486,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mode_bits = scm_i_mode_bits (mode);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* macOS starting with 10.12 defines mkostemp(2) which is used if defined,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * but only accepts some flags according to its manpage. It fails with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * invalid argument when other flags are passed. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ open_flags &= O_APPEND | O_SHLOCK | O_EXLOCK | O_CLOEXEC;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SCM_SYSCALL (rv = mkostemp (c_tmpl, open_flags));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (rv == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SCM_SYSERROR;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/guile/files/sierra.patch b/lang/guile/files/sierra.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7b74cc7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/guile/files/sierra.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-http://osdir.com/ml/bug-guile-gnu/2016-06/msg00180.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/libguile/stime.c b/libguile/stime.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f430ca4..8b810a7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libguile/stime.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libguile/stime.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -834,6 +834,10 @@ scm_init_stime()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_POSIX_CPUTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (clock_gettime (CLOCK_PROCESS_CPUTIME_ID, &posix_run_time_base) == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ get_internal_run_time = get_internal_run_time_posix_timer;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clockid_t dummy;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Only use the _POSIX_CPUTIME clock if it's going to work across
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -843,6 +847,7 @@ scm_init_stime()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- get_internal_run_time = get_internal_run_time_posix_timer;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- errno = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* HAVE_POSIX_CPUTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* HAVE_CLOCKTIME */
</span></pre><pre style='margin:0'>
</pre>