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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 26789158F58 for ; Mon, 16 Aug 2021 20:48:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5881E0101; Mon, 16 Aug 2021 16:18:00 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C914DE0101 for ; Mon, 16 Aug 2021 16:18:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A0592347225 for ; Mon, 16 Aug 2021 16:17:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 090F585C for ; Mon, 16 Aug 2021 16:17:58 +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: <1629130659.51baf1a63c646e68217f5dfd81c09999fb07a87c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/hostapd/hostapd-2.9-r6.ebuild net-wireless/hostapd/hostapd-9999.ebuild X-VCS-Directories: net-wireless/hostapd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 51baf1a63c646e68217f5dfd81c09999fb07a87c X-VCS-Branch: master Date: Mon, 16 Aug 2021 16:17:58 +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: 881949da-92aa-4d19-909a-505198b7ea5e X-Archives-Hash: 4f6fe417f26dfcc756281300e371e5ab commit: 51baf1a63c646e68217f5dfd81c09999fb07a87c Author: Jakov Smolic sartura hr> AuthorDate: Mon Aug 16 14:54:59 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Aug 16 16:17:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51baf1a6 net-wireless/hostapd: Correctly detect libnl when cross-compiling * Build system tries to find libnl only on the host system, which breaks cross-compilation as it cannot find it: ``` Package libnl-3.0 was not found in the pkg-config search path. Perhaps you should add the directory containing `libnl-3.0.pc' to the PKG_CONFIG_PATH environment variable Package 'libnl-3.0', required by 'virtual:world', not found ``` * We can solve this using pkg-config to pass additional include for the cross-compilation libnl to the CFLAGS Signed-off-by: Jakov Smolic sartura.hr> Closes: https://github.com/gentoo/gentoo/pull/22005 Signed-off-by: Sam James gentoo.org> net-wireless/hostapd/hostapd-2.9-r6.ebuild | 4 +++- net-wireless/hostapd/hostapd-9999.ebuild | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/net-wireless/hostapd/hostapd-2.9-r6.ebuild b/net-wireless/hostapd/hostapd-2.9-r6.ebuild index 8878538c886..1b8727055c9 100644 --- a/net-wireless/hostapd/hostapd-2.9-r6.ebuild +++ b/net-wireless/hostapd/hostapd-2.9-r6.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit toolchain-funcs systemd savedconfig +inherit flag-o-matic systemd savedconfig toolchain-funcs DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon" HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/" @@ -40,6 +40,7 @@ DEPEND=" netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 )" RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" pkg_pretend() { if use internal-tls; then @@ -194,6 +195,7 @@ src_configure() { # support it. if has_version ">=dev-libs/libnl-3.2"; then echo "CONFIG_LIBNL32=y" >> ${CONFIG} || die + append-cflags $($(tc-getPKG_CONFIG) --cflags libnl-3.0) fi # TODO: Add support for BSD drivers diff --git a/net-wireless/hostapd/hostapd-9999.ebuild b/net-wireless/hostapd/hostapd-9999.ebuild index b9116b4cb25..dacd094e49e 100644 --- a/net-wireless/hostapd/hostapd-9999.ebuild +++ b/net-wireless/hostapd/hostapd-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit toolchain-funcs systemd savedconfig +inherit flag-o-matic systemd savedconfig toolchain-funcs DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon" HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/" @@ -40,6 +40,7 @@ DEPEND=" netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 )" RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" pkg_pretend() { if use internal-tls; then @@ -184,6 +185,7 @@ src_configure() { # support it. if has_version ">=dev-libs/libnl-3.2"; then echo "CONFIG_LIBNL32=y" >> ${CONFIG} || die + append-cflags $($(tc-getPKG_CONFIG) --cflags libnl-3.0) fi # TODO: Add support for BSD drivers