forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
dev-scheme/guile: fix compilation on Darwin, thanks * in bug #612338
Package-Manager: Portage-2.3.6, Repoman-2.3.1
- Loading branch information
Showing
2 changed files
with
42 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
fix compilation on Darwin | ||
|
||
https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24862#23 | ||
https://bugs.gentoo.org/show_bug.cgi?id=612338 | ||
|
||
--- guile-2.0.14/libguile/filesys.c | ||
+++ guile-2.0.14/libguile/filesys.c | ||
@@ -1486,6 +1486,9 @@ | ||
mode_bits = scm_i_mode_bits (mode); | ||
} | ||
|
||
+#ifdef __APPLE__ | ||
+ open_flags &= O_APPEND|O_SHLOCK|O_EXLOCK|O_CLOEXEC; | ||
+#endif | ||
SCM_SYSCALL (rv = mkostemp (c_tmpl, open_flags)); | ||
if (rv == -1) | ||
SCM_SYSERROR; | ||
--- guile-2.0.14/libguile/stime.c | ||
+++ guile-2.0.14/libguile/stime.c | ||
@@ -830,6 +830,10 @@ | ||
|
||
#ifdef HAVE_POSIX_CPUTIME | ||
{ | ||
+#ifdef __APPLE__ | ||
+ 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; | ||
|
||
/* Only use the _POSIX_CPUTIME clock if it's going to work across | ||
@@ -839,6 +843,7 @@ | ||
get_internal_run_time = get_internal_run_time_posix_timer; | ||
else | ||
errno = 0; | ||
+#endif | ||
} | ||
#endif /* HAVE_POSIX_CPUTIME */ | ||
#endif /* HAVE_CLOCKTIME */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters