From: Rosen Penev <redacted>
Date: Tue, 7 Apr 2020 01:31:14 +0000 (-0700)
Subject: bind: use json-c instead of jsoncpp
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=bdc23034ca061ad118f1031a5af7270a745498c5;p=openwrt-packages.git

bind: use json-c instead of jsoncpp

The configure script prefers the latter whereas the code prefers the
latter. Hack around it.

Signed-off-by: Rosen Penev <redacted>
---

diff --git a/net/bind/Makefile b/net/bind/Makefile
index 9832705e4..b0d3e5dee 100644
--- a/net/bind/Makefile
+++ b/net/bind/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bind
 PKG_VERSION:=9.14.8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 USERID:=bind=57:bind=57
 
 PKG_MAINTAINER:=Noah Meyerhans <frodo@morgul.net>
@@ -125,6 +125,7 @@ endef
 
 export BUILD_CC="$(TARGET_CC)"
 
+TARGET_CFLAGS += -DHAVE_JSON_C -UHAVE_JSON
 TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
 
 CONFIGURE_ARGS += \