aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Baruch Siach <baruch@tkos.co.il>2020-11-05 20:15:46 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2021-02-04 16:39:30 +0100
commit30fe836f246324fb481e131488b9956bd96236f6 (patch)
tree714c279906f69bd9f945f447a44d7df5449284c6
parentc787d0000cae09b4b17d04594e983d0da91c2002 (diff)
downloadbuildroot-30fe836f246324fb481e131488b9956bd96236f6.tar.gz
buildroot-30fe836f246324fb481e131488b9956bd96236f6.tar.bz2
package/dnsmasq: bump to version 2.82
Drop Makefile modification for pkg-config. Build time PATH ensures that the Buildroot pkg-config is used. Cc: Matt Weber <matthew.weber@rockwellcollins.com> Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> (cherry picked from commit 62257b3247d253639354a5519ac51ca1e4daff05) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/dnsmasq/dnsmasq.hash4
-rw-r--r--package/dnsmasq/dnsmasq.mk8
2 files changed, 3 insertions, 9 deletions
diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash
index 99e417f069..401f930baf 100644
--- a/package/dnsmasq/dnsmasq.hash
+++ b/package/dnsmasq/dnsmasq.hash
@@ -1,6 +1,6 @@
# Locally calculated after checking pgp signature
-# http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.81.tar.xz.asc
-sha256 749ca903537c5197c26444ac24b0dce242cf42595fdfe6b9a5b9e4c7ad32f8fb dnsmasq-2.81.tar.xz
+# http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.82.tar.xz.asc
+sha256 84523646f3116bb5e1151efb66e645030f6e6a8256f29aab444777a343ebc132 dnsmasq-2.82.tar.xz
# Locally calculated
sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3
diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 4a7218a2b7..117be38d4b 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -4,7 +4,7 @@
#
################################################################################
-DNSMASQ_VERSION = 2.81
+DNSMASQ_VERSION = 2.82
DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz
DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"
@@ -77,13 +77,7 @@ DNSMASQ_DEPENDENCIES += ubus
DNSMASQ_COPTS += -DHAVE_UBUS
endif
-define DNSMASQ_FIX_PKGCONFIG
- $(SED) 's^PKG_CONFIG = pkg-config^PKG_CONFIG = $(PKG_CONFIG_HOST_BINARY)^' \
- $(DNSMASQ_DIR)/Makefile
-endef
-
define DNSMASQ_BUILD_CMDS
- $(DNSMASQ_FIX_PKGCONFIG)
$(DNSMASQ_TWEAK_LIBLUA)
$(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPTS) all$(DNSMASQ_I18N)
endef