Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 734790 - net-wireless/wpa_supplicant: fix pkg-config, drop libressl
Summary: net-wireless/wpa_supplicant: fix pkg-config, drop libressl
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Rick Farina (Zero_Chaos)
URL:
Whiteboard:
Keywords: PATCH
Depends on:
Blocks:
 
Reported: 2020-07-30 15:27 UTC by David Michael
Modified: 2021-04-02 19:30 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
fix.patch (0001-net-wireless-wpa_supplicant-fix-pkg-config-drop-libr.patch,7.03 KB, patch)
2021-03-26 18:34 UTC, David Michael
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description David Michael 2020-07-30 15:27:06 UTC
The ebuilds are using EAPI 7 and do not define BDEPEND.  They have pkgconfig in DEPEND, but there is no use in cross-compiling pkgconfig.  It should be in BDEPEND to depend on a natively executable installation.

Reproducible: Always

Steps to Reproduce:
1. emerge -v net-wireless/wpa_supplicant  # with a sysroot profile

Actual Results:  
It cross-compiles pkgconfig.

Expected Results:  
It should use the native pkgconfig.

--- net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
+++ net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
@@ -29,7 +29,7 @@
 	broadcom-sta? ( !fils !mesh !mbo )
 "
 
-CDEPEND="dbus? ( sys-apps/dbus )
+DEPEND="dbus? ( sys-apps/dbus )
 	kernel_linux? (
 		dev-libs/libnl:3
 		net-wireless/crda
@@ -49,12 +49,10 @@
 	!libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] )
 	libressl? ( dev-libs/libressl:0= )
 "
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-networkmanager )
 "
+BDEPEND="virtual/pkgconfig"
 
 DOC_CONTENTS="
 	If this is a clean installation of wpa_supplicant, you
Comment 1 David Michael 2021-03-26 18:34:25 UTC
Created attachment 694500 [details, diff]
fix.patch

I'm updating the patch to fix which pkg-config version gets used.  The Makefiles have a bunch of "PKG_CONFIG ?= pkg-config"s, which will end up using the wrong version when cross-compiling unless it's exported.

This also cleans up libressl support since it's being removed.

Also drop eutils since I don't see it being used.
Comment 2 Larry the Git Cow gentoo-dev 2021-04-02 19:29:33 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92dac892940defc0627d8155910f4c13014b939c

commit 92dac892940defc0627d8155910f4c13014b939c
Author:     David Michael <fedora.dm0@gmail.com>
AuthorDate: 2021-03-26 18:31:47 +0000
Commit:     Rick Farina <zerochaos@gentoo.org>
CommitDate: 2021-04-02 19:29:31 +0000

    net-wireless/wpa_supplicant: fix pkg-config, drop libressl
    
    Closes: https://bugs.gentoo.org/734790
    Package-Manager: Portage-3.0.13, Repoman-3.0.2
    Signed-off-by: David Michael <fedora.dm0@gmail.com>
    Signed-off-by: Rick Farina <zerochaos@gentoo.org>

 .../wpa_supplicant/wpa_supplicant-2.9-r2.ebuild    | 35 ++++++++--------------
 .../wpa_supplicant/wpa_supplicant-9999.ebuild      | 35 ++++++++--------------
 2 files changed, 24 insertions(+), 46 deletions(-)
Comment 3 Rick Farina (Zero_Chaos) gentoo-dev 2021-04-02 19:30:33 UTC
Thanks for the patch.  I rudely pushed it right into stable without a revbump.