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 843B6158087 for ; Fri, 4 Feb 2022 15:19:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C02BE07D7; Fri, 4 Feb 2022 15:19:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 C62E3E07D7 for ; Fri, 4 Feb 2022 15:19:52 +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 A04C4343228 for ; Fri, 4 Feb 2022 15:19:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CDCBA1EF for ; Fri, 4 Feb 2022 15:19:49 +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: <1643987982.36d4c4e69edfc56c9c515bb29af7abd39cb02c7c.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/bridge-utils/files/, net-misc/bridge-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild net-misc/bridge-utils/files/bridge-utils-1.7.1-musl.patch X-VCS-Directories: net-misc/bridge-utils/files/ net-misc/bridge-utils/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 36d4c4e69edfc56c9c515bb29af7abd39cb02c7c X-VCS-Branch: master Date: Fri, 4 Feb 2022 15:19:49 +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: 4a4b65ce-e14f-4eb7-bfe4-e7d5845be5fd X-Archives-Hash: 3a96951daf06a16cdcd42ae5023c9f8a commit: 36d4c4e69edfc56c9c515bb29af7abd39cb02c7c Author: Fabian Groffen gentoo org> AuthorDate: Fri Feb 4 15:19:42 2022 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Feb 4 15:19:42 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36d4c4e6 net-misc/bridge-utils-1.7.1-r1: fix compilation on musl Closes: https://bugs.gentoo.org/828902 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Fabian Groffen gentoo.org> net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild | 56 ++++++++++++++++++++++ .../files/bridge-utils-1.7.1-musl.patch | 10 ++++ 2 files changed, 66 insertions(+) diff --git a/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild b/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild new file mode 100644 index 000000000000..85a58f61fc89 --- /dev/null +++ b/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools linux-info toolchain-funcs + +DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge" +HOMEPAGE="http://bridge.sourceforge.net/" +SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="selinux" + +DEPEND="virtual/os-headers" +RDEPEND="selinux? ( sec-policy/selinux-brctl )" + +CONFIG_CHECK="~BRIDGE" +WARNING_BRIDGE="CONFIG_BRIDGE is required to get bridge devices in the kernel" + +get_headers() { + CTARGET=${CTARGET:-${CHOST}} + dir=/usr/include + tc-is-cross-compiler && dir=/usr/${CTARGET}/usr/include + echo "${dir}" +} + +src_prepare() { + local PATCHES=( + "${FILESDIR}"/libbridge-substitute-AR-variable-from-configure.patch + "${FILESDIR}"/${P}-musl.patch #828902 + ) + default + eautoreconf +} + +src_configure() { + # use santitized headers and not headers from /usr/src + local myeconfargs=( + --prefix=/ + --libdir=/usr/$(get_libdir) + --includedir=/usr/include + --with-linux-headers="$(get_headers)" + ) + econf "${myeconfargs[@]}" +} + +src_install() { + emake install DESTDIR="${D}" + dodoc AUTHORS ChangeLog README THANKS \ + doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST} + + [ -f "${ED}"/sbin/brctl ] || die "upstream makefile failed to install binary" +} diff --git a/net-misc/bridge-utils/files/bridge-utils-1.7.1-musl.patch b/net-misc/bridge-utils/files/bridge-utils-1.7.1-musl.patch new file mode 100644 index 000000000000..618811e80b7a --- /dev/null +++ b/net-misc/bridge-utils/files/bridge-utils-1.7.1-musl.patch @@ -0,0 +1,10 @@ +--- a/libbridge/libbridge.h ++++ b/libbridge/libbridge.h +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + #include + #include