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 3EC4F158087 for ; Thu, 3 Feb 2022 09:34:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7326A2BC005; Thu, 3 Feb 2022 09:34:14 +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 EF8D52BC005 for ; Thu, 3 Feb 2022 09:34:13 +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 D46E7342EAA for ; Thu, 3 Feb 2022 09:34:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 51A4C2AF for ; Thu, 3 Feb 2022 09:34:11 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1643880836.4745d7a71e44aa6a64ce554e60b0752f6f16e244.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/libreswan/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/libreswan/libreswan-4.6.ebuild X-VCS-Directories: net-vpn/libreswan/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4745d7a71e44aa6a64ce554e60b0752f6f16e244 X-VCS-Branch: master Date: Thu, 3 Feb 2022 09:34:11 +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: c0391f19-c17b-46b7-9dd3-c1ab77c3e0d7 X-Archives-Hash: 04354195841f971bee5c800aac6cfc7e commit: 4745d7a71e44aa6a64ce554e60b0752f6f16e244 Author: Sam James gentoo org> AuthorDate: Thu Feb 3 09:10:31 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Feb 3 09:33:56 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4745d7a7 net-vpn/libreswan: fix build on musl - Add queue-standalone for musl - Define -DGLIBC_KERN_FLIP_HEADERS to workaround header conflict Closes: https://bugs.gentoo.org/832617 Signed-off-by: Sam James gentoo.org> net-vpn/libreswan/libreswan-4.6.ebuild | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net-vpn/libreswan/libreswan-4.6.ebuild b/net-vpn/libreswan/libreswan-4.6.ebuild index cd32e99023da..afc9e62858a5 100644 --- a/net-vpn/libreswan/libreswan-4.6.ebuild +++ b/net-vpn/libreswan/libreswan-4.6.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit systemd toolchain-funcs tmpfiles +inherit systemd flag-o-matic toolchain-funcs tmpfiles DESCRIPTION="IPsec implementation for Linux, fork of Openswan" HOMEPAGE="https://libreswan.org/" @@ -46,6 +46,7 @@ RDEPEND="${DEPEND} !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec ) " +DEPEND+=" elibc_musl? ( sys-libs/queue-standalone )" usetf() { usex "$1" true false @@ -61,6 +62,9 @@ src_prepare() { src_configure() { tc-export AR CC + + use elibc_musl && append-cflags -DGLIBC_KERN_FLIP_HEADERS + export PREFIX=/usr export FINALEXAMPLECONFDIR=/usr/share/doc/${PF} export FINALDOCDIR=/usr/share/doc/${PF}/html