package/whois: add host-pkgconf mandatory dependency
pkg-config is used to check if libidn2 is available since version 5.2.18
and
e20b8bbab3
This can lead to a build failure if a broken libidn2.pc is found on host
so add a mandatory host-pkgconf dependency and drop our manual handling
of HAVE_LIBIDN2 option (which does not exist anymore)
Fixes:
- http://autobuild.buildroot.org/results/6cd0dd779d72b7162943f0f7dbb4e7d258b463eb
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
4071a7d743
commit
1835cbbfa1
|
@ -7,7 +7,10 @@
|
||||||
WHOIS_VERSION = 5.5.5
|
WHOIS_VERSION = 5.5.5
|
||||||
WHOIS_SITE = http://snapshot.debian.org/archive/debian/20200123T155144Z/pool/main/w/whois
|
WHOIS_SITE = http://snapshot.debian.org/archive/debian/20200123T155144Z/pool/main/w/whois
|
||||||
WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz
|
WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz
|
||||||
WHOIS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
|
WHOIS_DEPENDENCIES = \
|
||||||
|
host-pkgconf \
|
||||||
|
$(if $(BR2_PACKAGE_LIBIDN2),libidn2) \
|
||||||
|
$(TARGET_NLS_DEPENDENCIES)
|
||||||
WHOIS_MAKE_ENV = $(TARGET_MAKE_ENV)
|
WHOIS_MAKE_ENV = $(TARGET_MAKE_ENV)
|
||||||
WHOIS_MAKE_OPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
|
WHOIS_MAKE_OPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
|
||||||
LIBS="$(WHOIS_EXTRA_LIBS)"
|
LIBS="$(WHOIS_EXTRA_LIBS)"
|
||||||
|
@ -21,11 +24,6 @@ WHOIS_EXTRA_LIBS += -liconv
|
||||||
WHOIS_MAKE_ENV += HAVE_ICONV=1
|
WHOIS_MAKE_ENV += HAVE_ICONV=1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_LIBIDN2),y)
|
|
||||||
WHOIS_DEPENDENCIES += libidn2
|
|
||||||
WHOIS_MAKE_ENV += HAVE_LIBIDN2=1
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
|
ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
|
||||||
WHOIS_BUILD_TARGETS =
|
WHOIS_BUILD_TARGETS =
|
||||||
WHOIS_INSTALL_TARGETS = install
|
WHOIS_INSTALL_TARGETS = install
|
||||||
|
|
Loading…
Reference in a new issue