From 1c77ab74dbaf30cd42b35401bac1998539bebafd Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sat, 11 Jan 2020 10:05:26 +0100 Subject: [PATCH] dnsmasq: patch Makefile to not override LDFLAGS --- root-packages/dnsmasq/Makefile.patch | 14 +++++++++----- root-packages/dnsmasq/build.sh | 1 + 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/root-packages/dnsmasq/Makefile.patch b/root-packages/dnsmasq/Makefile.patch index d18d48674..e3a87e679 100644 --- a/root-packages/dnsmasq/Makefile.patch +++ b/root-packages/dnsmasq/Makefile.patch @@ -1,6 +1,6 @@ ---- ../Makefile.orig 2018-05-08 13:11:40.707974108 +0000 -+++ ./Makefile 2018-05-08 13:17:01.037389651 +0000 -@@ -18,14 +18,14 @@ +--- ./Makefile.orig 2020-01-11 09:55:44.939872951 +0100 ++++ ./Makefile 2020-01-11 09:56:29.246687538 +0100 +@@ -18,17 +18,17 @@ # Variables you may well want to override. @@ -15,7 +15,11 @@ -CFLAGS = -Wall -W -O2 -LDFLAGS = +CFLAGS ?= -Wall -W -O2 -+LDFLAGS = -llog ++LDFLAGS ?= COPTS = RPM_OPT_FLAGS = - LIBS = +-LIBS = ++LIBS = -llog + + ################################################################# + diff --git a/root-packages/dnsmasq/build.sh b/root-packages/dnsmasq/build.sh index 8704e0411..9b8cacfd4 100644 --- a/root-packages/dnsmasq/build.sh +++ b/root-packages/dnsmasq/build.sh @@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html TERMUX_PKG_DESCRIPTION="Dnsmasq provides network infrastructure for small networks" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=2.80 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=cdaba2785e92665cf090646cba6f94812760b9d7d8c8d0cfb07ac819377a63bb TERMUX_PKG_BUILD_IN_SRC=true