From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 71D5E139694 for ; Wed, 21 Jun 2017 12:33:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C24CF23401F; Wed, 21 Jun 2017 12:33:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9FA2323401F for ; Wed, 21 Jun 2017 12:33:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 899EE341B9B for ; Wed, 21 Jun 2017 12:33:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4E4CF24BA for ; Wed, 21 Jun 2017 12:33:41 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1498048416.13a0978fd44908dcd1565318ecdf34b0814dcbdc.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile/, dev-scheme/guile/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-scheme/guile/files/guile-2.0.14-darwin.patch dev-scheme/guile/guile-2.0.14.ebuild X-VCS-Directories: dev-scheme/guile/files/ dev-scheme/guile/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 13a0978fd44908dcd1565318ecdf34b0814dcbdc X-VCS-Branch: master Date: Wed, 21 Jun 2017 12:33:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b3b006e7-b5df-44a0-8a18-1e92dc886b20 X-Archives-Hash: 8008fb9189fdfb95615279be863bc8eb commit: 13a0978fd44908dcd1565318ecdf34b0814dcbdc Author: Fabian Groffen gentoo org> AuthorDate: Wed Jun 21 12:33:25 2017 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Wed Jun 21 12:33:36 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13a0978f dev-scheme/guile: fix compilation on Darwin, thanks * in bug #612338 Package-Manager: Portage-2.3.6, Repoman-2.3.1 dev-scheme/guile/files/guile-2.0.14-darwin.patch | 38 ++++++++++++++++++++++++ dev-scheme/guile/guile-2.0.14.ebuild | 5 +++- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dev-scheme/guile/files/guile-2.0.14-darwin.patch b/dev-scheme/guile/files/guile-2.0.14-darwin.patch new file mode 100644 index 00000000000..17741ae352c --- /dev/null +++ b/dev-scheme/guile/files/guile-2.0.14-darwin.patch @@ -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 */ diff --git a/dev-scheme/guile/guile-2.0.14.ebuild b/dev-scheme/guile/guile-2.0.14.ebuild index 78edbb0f216..6be23f4049e 100644 --- a/dev-scheme/guile/guile-2.0.14.ebuild +++ b/dev-scheme/guile/guile-2.0.14.ebuild @@ -32,7 +32,10 @@ MAJOR="2.0" DOCS=( GUILE-VERSION HACKING README ) -PATCHES=( "${FILESDIR}/${PN}-2-snarf.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-2-snarf.patch" + "${FILESDIR}/${P}-darwin.patch" +) src_prepare() { default