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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5F47915808B for ; Sat, 16 Apr 2022 14:37:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B877E08EF; Sat, 16 Apr 2022 14:37:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3FE1EE08EF for ; Sat, 16 Apr 2022 14:37:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B39634195C for ; Sat, 16 Apr 2022 14:37:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 54F733AA for ; Sat, 16 Apr 2022 14:37:30 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1650119826.e8ba90674eb9321d64f79d341b7aede07c5a8bd5.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/aranym/files/, app-emulation/aranym/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/aranym/aranym-1.1.0.ebuild app-emulation/aranym/files/aranym-1.1.0-libcwrap.patch X-VCS-Directories: app-emulation/aranym/files/ app-emulation/aranym/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: e8ba90674eb9321d64f79d341b7aede07c5a8bd5 X-VCS-Branch: master Date: Sat, 16 Apr 2022 14:37:30 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f39612e0-c2e3-485f-84f7-2b806191690f X-Archives-Hash: 4c4c1c3351e7db70eec8c9b56bc482ec commit: e8ba90674eb9321d64f79d341b7aede07c5a8bd5 Author: James Le Cuirot gentoo org> AuthorDate: Sat Apr 16 14:37:06 2022 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sat Apr 16 14:37:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8ba9067 app-emulation/aranym: Patch to fix musl build Closes: https://bugs.gentoo.org/830437 Signed-off-by: James Le Cuirot gentoo.org> app-emulation/aranym/aranym-1.1.0.ebuild | 1 + .../aranym/files/aranym-1.1.0-libcwrap.patch | 24 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/app-emulation/aranym/aranym-1.1.0.ebuild b/app-emulation/aranym/aranym-1.1.0.ebuild index fe2c0f728ab6..87efc9b39976 100644 --- a/app-emulation/aranym/aranym-1.1.0.ebuild +++ b/app-emulation/aranym/aranym-1.1.0.ebuild @@ -38,6 +38,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-1.1.0-conditional-installs.patch + "${FILESDIR}"/${PN}-1.1.0-libcwrap.patch ) ECONF_SOURCE="${S}" diff --git a/app-emulation/aranym/files/aranym-1.1.0-libcwrap.patch b/app-emulation/aranym/files/aranym-1.1.0-libcwrap.patch new file mode 100644 index 000000000000..39ef32c7cc41 --- /dev/null +++ b/app-emulation/aranym/files/aranym-1.1.0-libcwrap.patch @@ -0,0 +1,24 @@ +From baa00c51d3cd63602912ee1b252fa774a43b042f Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Sat, 16 Apr 2022 10:41:44 +0100 +Subject: [PATCH] Use libcwrap.h specifically with glibc, not just Linux, to + fix musl + +--- + src/include/linux/libcwrap.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/include/linux/libcwrap.h b/src/include/linux/libcwrap.h +index f68bafb1..9c5c6b8e 100644 +--- a/src/include/linux/libcwrap.h ++++ b/src/include/linux/libcwrap.h +@@ -1,5 +1,5 @@ + /* glibc bindings for target ABI version glibc 2.11 */ +-#if defined(__linux__) && !defined (__LIBC_CUSTOM_BINDINGS_H__) && !defined(__ANDROID__) ++#if defined(__GLIBC__) && defined(__linux__) && !defined (__LIBC_CUSTOM_BINDINGS_H__) && !defined(__ANDROID__) + + #if defined (__cplusplus) + extern "C" { +-- +2.34.1 +