Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bind9: update to 9.16.1

Browse source 
Add libuv dependency

Fix optional libxml and c-json dependency handling

Signed-off-by: Noah Meyerhans <frodo@morgul.net>
This commit is contained in:
Noah Meyerhans 2020-03-22 10:09:20 -07:00
parent 49d102503a
commit 72654d20d5
1 changed files with 14 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
net/bind/Makefile
View file

@ -1,6 +1,6 @@
#
# Copyright (C) 2006-2012 OpenWrt.org
# 2014-2017 Noah Meyerhans <frodo@morgul.net>
# 2014-2020 Noah Meyerhans <frodo@morgul.net>
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@ -9,8 +9,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=bind
PKG_VERSION:=9.14.8
PKG_RELEASE:=2
PKG_VERSION:=9.16.1
PKG_RELEASE:=1
USERID:=bind=57:bind=57
PKG_MAINTAINER:=Noah Meyerhans <frodo@morgul.net>
@ -18,11 +18,11 @@ PKG_LICENSE:=MPL-2.0
PKG_LICENSE_FILES:=LICENSE
PKG_CPE_ID:=cpe:/a:isc:bind
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:= \
https://www.mirrorservice.org/sites/ftp.isc.org/isc/bind9/$(PKG_VERSION) \
https://ftp.isc.org/isc/bind9/$(PKG_VERSION)
PKG_HASH:=e545aa75ced6695a9bf4b591606ef00260fb3c055c2865b299cfe0fe6eeea076
PKG_HASH:=a913d7e78135b9123d233215b58102fa0f18130fb1e158465a1c2b6f3bd75e91
PKG_FIXUP:=autoreconf
PKG_REMOVE_FILES:=aclocal.m4 libtool.m4
@ -35,12 +35,7 @@ PKG_CONFIG_DEPENDS := \
CONFIG_BIND_LIBJSON \
CONFIG_BIND_LIBXML2
ifdef CONFIG_BIND_LIBXML2
PKG_BUILD_DEPENDS += libxml2
endif
ifdef CONFIG_BIND_LIBJSON
PKG_BUILD_DEPENDS += libjson-c
endif
PKG_BUILD_DEPENDS += BIND_LIBXML2:libxml2 BIND_LIBJSON:libjson-c
include $(INCLUDE_DIR)/package.mk
@ -56,15 +51,10 @@ endef
define Package/bind-libs
SECTION:=libs
CATEGORY:=Libraries
DEPENDS:=+libopenssl +zlib +libpthread +libatomic
DEPENDS:=+libopenssl +zlib +libpthread +libatomic +libuv \
+BIND_LIBXML2:libxml2 +BIND_LIBJSON:libjson-c
TITLE:=bind shared libraries
URL:=https://www.isc.org/software/bind
ifdef CONFIG_BIND_LIBJSON
DEPENDS+= +libjson-c
endif
ifdef CONFIG_BIND_LIBXML2
DEPENDS+= +libxml2
endif
endef
define Package/bind-server
@ -78,7 +68,7 @@ endef
define Package/bind-server-filter-aaaa
$(call Package/bind-server)
DEPENDS:=+bind-server
DEPENDS:=bind-server
TITLE+= filter AAAA plugin
endef
@ -125,7 +115,6 @@ endef
export BUILD_CC="$(TARGET_CC)"
TARGET_CFLAGS += -DHAVE_JSON_C -UHAVE_JSON
TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
CONFIGURE_ARGS += \
@ -140,19 +129,20 @@ CONFIGURE_ARGS += \
--sysconfdir=/etc/bind
ifdef CONFIG_BIND_LIBJSON
TARGET_CFLAGS += -DHAVE_JSON_C -UHAVE_JSON
CONFIGURE_ARGS += \
--with-libjson="$(STAGING_DIR)/usr"
--with-json-c=yes
else
CONFIGURE_ARGS += \
--without-libjson
--with-json-c=no
endif
ifdef CONFIG_BIND_LIBXML2
CONFIGURE_ARGS += \
--with-libxml2="$(STAGING_DIR)/usr"
--with-libxml2=yes
else
CONFIGURE_ARGS += \
--without-libxml2
--with-libxml2=no
endif
CONFIGURE_VARS += \