Browse Source

Merge pull request #5929 from iamperson347/getdns-libidn2-update

getdns: Package update to replace libidn support with libidn2
lilik-openwrt-22.03
Hannu Nyman 7 years ago
committed by GitHub
parent
commit
ad86eaa71f
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
  1. +3
    -3
      libs/getdns/Config.in
  2. +5
    -5
      libs/getdns/Makefile

+ 3
- 3
libs/getdns/Config.in View File

@ -7,10 +7,10 @@ config GETDNS_ENABLE_STUB_ONLY
getdns can be configured for stub resolution mode only. (Removes libunbound dependency)
default y
config GETDNS_ENABLE_IDN_LIBIDN
bool "GETDNS_ENABLE_IDN_LIBIDN"
config GETDNS_ENABLE_IDN_LIBIDN2
bool "GETDNS_ENABLE_IDN_LIBIDN2"
help
getdns can be configured with some IDN Support. (Requires libidn dependency)
getdns can be configured with some IDN Support. (Requires libidn2 dependency)
default n
endmenu

+ 5
- 5
libs/getdns/Makefile View File

@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=getdns
PKG_VERSION:=1.4.1
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE
@ -22,7 +22,7 @@ PKG_INSTALL:=1
PKG_CONFIG_DEPENDS:= \
CONFIG_GETDNS_ENABLE_STUB_ONLY \
CONFIG_GETDNS_ENABLE_IDN_LIBIDN
CONFIG_GETDNS_ENABLE_IDN_LIBIDN2
include $(INCLUDE_DIR)/package.mk
@ -36,7 +36,7 @@ define Package/getdns
SECTION:=libs
CATEGORY:=Libraries
TITLE+= (library)
DEPENDS+= +libopenssl +!GETDNS_ENABLE_STUB_ONLY:libunbound +GETDNS_ENABLE_IDN_LIBIDN:libidn
DEPENDS+= +libopenssl +!GETDNS_ENABLE_STUB_ONLY:libunbound +GETDNS_ENABLE_IDN_LIBIDN2:libidn2
MENU:=1
endef
@ -51,8 +51,8 @@ endef
CONFIGURE_ARGS += \
$(if $(CONFIG_GETDNS_ENABLE_STUB_ONLY), --enable-stub-only, ) \
$(if $(CONFIG_GETDNS_ENABLE_IDN_LIBIDN), , --without-libidn ) \
--without-libidn2 \
--without-libidn \
$(if $(CONFIG_GETDNS_ENABLE_IDN_LIBIDN2), , --without-libidn2 ) \
--with-ssl="$(STAGING_DIR)/usr" \
define Build/InstallDev


Loading…
Cancel
Save