| Message ID | 20190413083724.10701-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/hostapd: fix static build with openssl and atomic | expand |
On 13/04/2019 10:37, Fabrice Fontaine wrote: > Use pkg-config to find openssl dependencies such as lz or latomic > > Fix build on sparc v8 (even if there is no autobuilder failures yet) > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Applied to master, thanks. Regards, Arnout > --- > package/hostapd/hostapd.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk > index b7ebe26a28..e2b0feec9b 100644 > --- a/package/hostapd/hostapd.mk > +++ b/package/hostapd/hostapd.mk > @@ -35,8 +35,8 @@ HOSTAPD_CONFIG_DISABLE = > > # Try to use openssl if it's already available > ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) > -HOSTAPD_DEPENDENCIES += libopenssl > -HOSTAPD_LIBS += $(if $(BR2_STATIC_LIBS),-lcrypto -lz) > +HOSTAPD_DEPENDENCIES += host-pkgconf libopenssl > +HOSTAPD_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs openssl` > HOSTAPD_CONFIG_EDITS += 's/\#\(CONFIG_TLS=openssl\)/\1/' > else > HOSTAPD_CONFIG_DISABLE += CONFIG_EAP_PWD >
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > Use pkg-config to find openssl dependencies such as lz or latomic > Fix build on sparc v8 (even if there is no autobuilder failures yet) > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Committed to 2019.02.x, thanks.
diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index b7ebe26a28..e2b0feec9b 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -35,8 +35,8 @@ HOSTAPD_CONFIG_DISABLE = # Try to use openssl if it's already available ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) -HOSTAPD_DEPENDENCIES += libopenssl -HOSTAPD_LIBS += $(if $(BR2_STATIC_LIBS),-lcrypto -lz) +HOSTAPD_DEPENDENCIES += host-pkgconf libopenssl +HOSTAPD_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs openssl` HOSTAPD_CONFIG_EDITS += 's/\#\(CONFIG_TLS=openssl\)/\1/' else HOSTAPD_CONFIG_DISABLE += CONFIG_EAP_PWD
Use pkg-config to find openssl dependencies such as lz or latomic Fix build on sparc v8 (even if there is no autobuilder failures yet) Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/hostapd/hostapd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)