Skip to contentSkip to conversation

package/libfreefare: fix static build with latomic

PATCH New Fabrice Fontaine 3 participants 3 messages Apr 12, 2019 – Apr 24, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libfreefare: fix static build with latomic

Use pkg-config to retrieve openssl dependencies such as lz or latomic

Fixes:
- http://autobuild.buildroot.org/results/9bf69f238a63ea28690f7c0dbb8c30feb0afc5ad

---
 package/libfreefare/libfreefare.mk | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
package/libfreefare/libfreefare.mk +2 -6
index 13e6f2ad5e..16f15b34e4 100644
@@ -9,13 +9,9 @@ LIBFREEFARE_SOURCE = libfreefare-$(LIBFREEFARE_VERSION).tar.bz2
 # Do not use the github helper here, the generated tarball is *NOT*
 # the same as the one uploaded by upstream for the release.
 LIBFREEFARE_SITE = https://github.com/nfc-tools/libfreefare/releases/download/libfreefare-$(LIBFREEFARE_VERSION)
-LIBFREEFARE_DEPENDENCIES = libnfc openssl
+LIBFREEFARE_DEPENDENCIES = host-pkgconf libnfc openssl
 LIBFREEFARE_LICENSE = LGPL-3.0+ with exception
 LIBFREEFARE_LICENSE_FILES = COPYING
-
-ifeq ($(BR2_STATIC_LIBS),y)
-# openssl needs zlib even if the libfreefare example itself doesn't
-LIBFREEFARE_CONF_ENV += LIBS='-lz'
-endif
+LIBFREEFARE_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl`
 
 $(eval $(autotools-package))
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/libfreefare: fix static build with latomic

Quoted 6 lines · Fabrice Fontaine

Use pkg-config to retrieve openssl dependencies such as lz or latomic

Fixes:
- http://autobuild.buildroot.org/results/9bf69f238a63ea28690f7c0dbb8c30feb0afc5ad

Applied to master, thanks.

Regards,
Arnout

Quoted 25 lines
---
 package/libfreefare/libfreefare.mk | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
package/libfreefare/libfreefare.mk +2 -6
index 13e6f2ad5e..16f15b34e4 100644
@@ -9,13 +9,9 @@ LIBFREEFARE_SOURCE = libfreefare-$(LIBFREEFARE_VERSION).tar.bz2
 # Do not use the github helper here, the generated tarball is *NOT*
 # the same as the one uploaded by upstream for the release.
 LIBFREEFARE_SITE = https://github.com/nfc-tools/libfreefare/releases/download/libfreefare-$(LIBFREEFARE_VERSION)
-LIBFREEFARE_DEPENDENCIES = libnfc openssl
+LIBFREEFARE_DEPENDENCIES = host-pkgconf libnfc openssl
 LIBFREEFARE_LICENSE = LGPL-3.0+ with exception
 LIBFREEFARE_LICENSE_FILES = COPYING
-
-ifeq ($(BR2_STATIC_LIBS),y)
-# openssl needs zlib even if the libfreefare example itself doesn't
-LIBFREEFARE_CONF_ENV += LIBS='-lz'
-endif
+LIBFREEFARE_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl`
 
 $(eval $(autotools-package))
#2 lore raw

PATCH 1/1 package/libfreefare: fix static build with latomic

In reply to Fabrice Fontaine
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

Use pkg-config to retrieve openssl dependencies such as lz or latomic Fixes:
- http://autobuild.buildroot.org/results/9bf69f238a63ea28690f7c0dbb8c30feb0afc5ad

Committed to 2019.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard