public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lua/lanes/, dev-lua/lanes/files/
Date: Tue, 23 Jan 2024 21:04:06 +0000 (UTC)	[thread overview]
Message-ID: <1706043827.711bfacdbc15f0fa865d6016a1a700662743f805.conikost@gentoo> (raw)

commit:     711bfacdbc15f0fa865d6016a1a700662743f805
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 21:01:31 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 21:03:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=711bfacd

dev-lua/lanes: fix compilation with musl

Closes: https://bugs.gentoo.org/830158
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 dev-lua/lanes/files/lanes-3.16.2-musl.patch | 27 +++++++++++++++++++++++++++
 dev-lua/lanes/lanes-3.16.2.ebuild           |  7 +++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/dev-lua/lanes/files/lanes-3.16.2-musl.patch b/dev-lua/lanes/files/lanes-3.16.2-musl.patch
new file mode 100644
index 000000000000..05508a57d85d
--- /dev/null
+++ b/dev-lua/lanes/files/lanes-3.16.2-musl.patch
@@ -0,0 +1,27 @@
+From 0e959e637b6ee85b0710e0608fe5d678ad7e0b78 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conikost@gentoo.org>
+Date: Tue, 23 Jan 2024 21:58:50 +0100
+Subject: [PATCH] src/threading.h: fix compilation on musl
+
+Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
+---
+ src/threading.h | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/threading.h b/src/threading.h
+index 3925076..b1706ac 100644
+--- a/src/threading.h
++++ b/src/threading.h
+@@ -113,7 +113,11 @@ enum e_status { PENDING, RUNNING, WAITING, DONE, ERROR_ST, CANCELLED };
+   #include <pthread.h>
+ 
+   #ifdef PLATFORM_LINUX
+-  # define _MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP
++    #if defined(__GLIBC__)
++      # define _MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP
++    #else
++      # define _MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE
++    #endif
+   #else
+     /* OS X, ... */
+   # define _MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE

diff --git a/dev-lua/lanes/lanes-3.16.2.ebuild b/dev-lua/lanes/lanes-3.16.2.ebuild
index 89c99904f4bc..a77abaafcacc 100644
--- a/dev-lua/lanes/lanes-3.16.2.ebuild
+++ b/dev-lua/lanes/lanes-3.16.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -31,7 +31,10 @@ BDEPEND="
 
 HTML_DOCS=( "docs/." )
 
-PATCHES=( "${FILESDIR}/${PN}-3.13.0-makefile.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-3.13.0-makefile.patch"
+	"${FILESDIR}/${PN}-3.16.2-musl.patch"
+)
 
 src_prepare() {
 	default


             reply	other threads:[~2024-01-23 21:04 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-23 21:04 Conrad Kostecki [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-11-30 21:19 [gentoo-commits] repo/gentoo:master commit in: dev-lua/lanes/, dev-lua/lanes/files/ Conrad Kostecki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1706043827.711bfacdbc15f0fa865d6016a1a700662743f805.conikost@gentoo \
    --to=conikost@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox