Re: GNU Guile 2.1.5 released (beta)

[Matt Wette <matt.wette@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 877 bytes --]


> On Dec 10, 2016, at 5:16 AM, Matt Wette <matt.wette@gmail.com> wrote:
> 
>> 
>> On Dec 9, 2016, at 7:28 AM, Matt Wette <matt.wette@gmail.com <mailto:matt.wette@gmail.com>> wrote:
>> 
>> 
>>> On Dec 7, 2016, at 11:55 AM, Andy Wingo <wingo@pobox.com <mailto:wingo@pobox.com>> wrote:
>>> 
>>> We are pleased to announce GNU Guile release 2.1.5.
>>> 
>>> Guile 2.1.5 is the fifth pre-release in what will eventually become the
>>> 2.2 release series.  We encourage you to test this release and provide
>>> feedback to guile-devel@gnu.org <mailto:guile-devel@gnu.org>.
>> 
>> I am building on my Mac running macOS 10.12.1, aka Sierra.  I will post my patches when I get through “make check”.  
>> 

Patches to date attached.  These address 
1) #23870 no clock_getcpuclockid
2) #24682 mkostemp
3) use of ALIGN needs cast in libguile/loader.c

Matt



[-- Attachment #2.1: Type: text/html, Size: 2140 bytes --]

[-- Attachment #2.2: patch-2.1.5-mwette161210a --]
[-- Type: application/octet-stream, Size: 1478 bytes --]

--- libguile/filesys.c-orig	2016-12-08 05:55:48.000000000 -0800
+++ libguile/filesys.c	2016-12-08 16:28:41.000000000 -0800
@@ -1492,6 +1492,10 @@
       mode_bits = scm_i_mode_bits (mode);
     }
 
+#ifdef __APPLE__
+  /* mkostemp() will fail on Mac OS 10.12 if any besides this used: */
+  open_flags &= (O_APPEND | O_SHLOCK | O_EXLOCK | O_CLOEXEC);
+#endif
   SCM_SYSCALL (rv = mkostemp (c_tmpl, open_flags));
   if (rv == -1)
     SCM_SYSERROR;
--- libguile/loader.c-orig	2016-12-10 18:19:34.000000000 -0800
+++ libguile/loader.c	2016-12-10 18:19:58.000000000 -0800
@@ -208,7 +208,7 @@
       ret = malloc (len + alignment - 1);
       if (!ret)
         abort ();
-      ret = (char *) ALIGN ((scm_t_uintptr) ret, alignment);
+      ret = (char *) ALIGN ((scm_t_uintptr) ret, (scm_t_uintptr) alignment);
     }
 
   return ret;
--- libguile/stime.c-orig	2016-12-08 05:48:31.000000000 -0800
+++ libguile/stime.c	2016-12-08 16:27:46.000000000 -0800
@@ -830,6 +830,11 @@
     get_internal_real_time = get_internal_real_time_posix_timer;
 
 #ifdef HAVE_POSIX_CPUTIME
+#ifdef __APPLE__
+  /* Darwin does not have clock_getcpuclockid(). Just do it anyway. */
+  if (clock_gettime (CLOCK_PROCESS_CPUTIME_ID, &posix_run_time_base) == 0)
+    get_internal_run_time = get_internal_run_time_posix_timer;
+#else
   {
     clockid_t dummy;
     
@@ -841,6 +846,7 @@
     else
       errno = 0;
   }
+#endif /* __APPLE__ */
 #endif /* HAVE_POSIX_CPUTIME */
 #endif /* HAVE_CLOCKTIME */
 

[-- Attachment #2.3: Type: text/html, Size: 257 bytes --]