Commit 1c7de59a authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

dnsmasq: bump to 2.55 and migrate to gentargets 



Closes #2005

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 88d451c8

CHANGES

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
	luasocket, rings, wsapi, xavante, xterm



	Updated/fixed packages: berkeleydb, busybox, cdrkit, dash,

	dialog, diffutils, distcc, dmalloc, fbv, file, gawk,

	dialog, diffutils, distcc, dmalloc, dnsmasq, fbv, file, gawk,

	gstreamer, gzip, intltool, ipsec-tools, iptables, libart,

	libfuse, libgpg-error, libidn, liblockfile, links, lmbench,

	lrzsz, make, module-init-tools, nbd, ncurses, netperf,
@@ -44,6 +44,7 @@ 
	#1957: Bump sqlite to 3.6.23.1

	#1987: intltool: Fix spelling mistake

	#1999: Typo in path checking

	#2005: Bump dnsmasq to 2.55 and migrate to gentargets

	#2035: ipsec-tools-0.7.2 fails to build with gcc-4.4.x

	#2038: Bump ncurses to 5.7

	#2095: make gconfig: undefined reference to symbol 'dlsym@@GLIBC_2.2.5'

package/dnsmasq/dnsmasq.mk

+27 −18
Original line number Diff line number Diff line
@@ -4,12 +4,11 @@ 
#

#############################################################



DNSMASQ_VERSION = 2.52

DNSMASQ_VERSION = 2.55

DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq

DNSMASQ_AUTORECONF = NO

DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)" LDFLAGS="$(TARGET_LDFLAGS)"

DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"

DNSMASQ_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) PREFIX=/usr install

DNSMASQ_MAKE_OPT += DESTDIR=$(TARGET_DIR)



ifneq ($(BR2_INET_IPV6),y)

	DNSMASQ_COPTS += -DNO_IPV6
@@ -37,24 +36,34 @@ ifeq ($(BR2_PACKAGE_DBUS),y) 
	DNSMASQ_DEPENDENCIES += host-pkg-config dbus

endif



$(eval $(call AUTOTARGETS,package,dnsmasq))



$(DNSMASQ_TARGET_CONFIGURE):

ifeq ($(BR2_PACKAGE_DBUS),y)

define DNSMASQ_ENABLE_DBUS

	$(SED) 's^.*#define HAVE_DBUS.*^#define HAVE_DBUS^' \

		$(DNSMASQ_DIR)/src/config.h

	$(SED) 's^PKG_CONFIG = pkg-config^PKG_CONFIG = $(PKG_CONFIG_HOST_BINARY)^' \

		$(DNSMASQ_DIR)/Makefile

	$(SED) 's^--cflags dbus-1^--cflags dbus-1 \| sed s\\\#-I/\\\#-I$(STAGING_DIR)/\\\#g^' \

		$(DNSMASQ_DIR)/Makefile

endef

else

define DNSMASQ_ENABLE_DBUS

	$(SED) 's^.*#define HAVE_DBUS.*^/* #define HAVE_DBUS */^' \

		$(DNSMASQ_DIR)/src/config.h

endef

endif

	touch $@



$(DNSMASQ_TARGET_UNINSTALL):

	$(call MESSAGE,"Uninstalling")

define DNSMASQ_BUILD_CMDS

	$(DNSMASQ_ENABLE_DBUS)

	$(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPT)

endef



define DNSMASQ_INSTALL_TARGET_CMDS

	$(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPT) install

endef



define DNSMASQ_UNINSTALL_TARGET_CMDS

	rm -f $(TARGET_DIR)/usr/sbin/dnsmasq

	rm -f $(TARGET_DIR)/usr/share/man/man8/dnsmasq.8

	rm -f $(DNSMASQ_TARGET_INSTALL_TARGET) $(DNSMASQ_HOOK_POST_INSTALL)
 
endef



$(eval $(call GENTARGETS,package,dnsmasq))