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 7AD35158086 for ; Tue, 14 Dec 2021 12:06:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44F202BC006; Tue, 14 Dec 2021 12:06:04 +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 20D732BC006 for ; Tue, 14 Dec 2021 12:06:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 B5D1C342FC0 for ; Tue, 14 Dec 2021 12:06:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C5E36206 for ; Tue, 14 Dec 2021 12:05:59 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1639483553.d0c412924396549a56cbbf19d4b27514abcafa84.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libptytty/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libptytty/libptytty-2.0.ebuild X-VCS-Directories: dev-libs/libptytty/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: d0c412924396549a56cbbf19d4b27514abcafa84 X-VCS-Branch: master Date: Tue, 14 Dec 2021 12:05:59 +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: 482fb66a-03d9-4037-aab5-65e294b190c8 X-Archives-Hash: 5766dd9981ff983ee39639d4851374f8 commit: d0c412924396549a56cbbf19d4b27514abcafa84 Author: Marek Szuba gentoo org> AuthorDate: Tue Dec 14 12:00:20 2021 +0000 Commit: Marek Szuba gentoo org> CommitDate: Tue Dec 14 12:05:53 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0c41292 dev-libs/libptytty: fix compilation against musl musl does not define _PATH_{LASTLOGX,UTMPX,WTMPX} so use the upstream-provided CMake arguments to define them ourselves, using the same path convention as what musl headers put in _PATH_{LASTLOG,UTMP,WTMP}. Extra quotes are important, as said variables are currently injected verbatim into headers and hilarity ensues if they are not quoted. Closes: https://bugs.gentoo.org/828923 Signed-off-by: Marek Szuba gentoo.org> dev-libs/libptytty/libptytty-2.0.ebuild | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dev-libs/libptytty/libptytty-2.0.ebuild b/dev-libs/libptytty/libptytty-2.0.ebuild index 5494e30f17a7..69ee5277a255 100644 --- a/dev-libs/libptytty/libptytty-2.0.ebuild +++ b/dev-libs/libptytty/libptytty-2.0.ebuild @@ -12,9 +12,23 @@ SRC_URI="http://dist.schmorp.de/${PN}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="elibc_musl" PATCHES=( "${FILESDIR}"/${PN}-2.0-rundir.patch ) DOCS=( Changes README ) + +src_configure() { + # Bug #828923 + local mycmakeargs=() + if use elibc_musl; then + mycmakeargs+=( + -DPT_LASTLOGX_FILE="\"/dev/null/lastlogx\"" + -DPT_WTMPX_FILE="\"/dev/null/wtmpx\"" + ) + fi + + cmake_src_configure +}