diff options
| author | Phil Sutter <phil@nwl.cc> | 2015-07-26 01:34:53 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-07-26 10:36:35 +0200 |
| commit | e8a2e04315d138863b743ff3f51af167cbcdae37 (patch) | |
| tree | 0a2f15efdac735cf0b284e3ee440e967219a2fb9 /package/maradns/patches/patch-build_Makefile_linux | |
| parent | 6533c46eac76c4c7f48db9b66cc891bae7204d00 (diff) | |
package/maradns: update to version 2.0.09
Additionally:
- Also minimize necessary patching. Still a bit hacky, but a lot less
intrusive at least.
- Allow enabling IPv6 support.
- Make sure /etc/maradns/logger exists, necessary for chroot operation
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'package/maradns/patches/patch-build_Makefile_linux')
| -rw-r--r-- | package/maradns/patches/patch-build_Makefile_linux | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/package/maradns/patches/patch-build_Makefile_linux b/package/maradns/patches/patch-build_Makefile_linux index 44b68b5a4..106efd2dd 100644 --- a/package/maradns/patches/patch-build_Makefile_linux +++ b/package/maradns/patches/patch-build_Makefile_linux @@ -1,6 +1,12 @@ ---- maradns-1.4.05.orig/build/Makefile.linux 2006-11-24 12:44:29.000000000 +0100 -+++ maradns-1.4.05/build/Makefile.linux 2011-01-21 16:36:23.968658279 +0100 -@@ -23,23 +23,23 @@ EXECS=server/maradns + - pass CFLAGS to compiler + - pass $(M) when compiling deadwood, no idea why that is missing originally + - do not pass $(M) when compiling in tcp/, as that would cause problems with + the implicit rules in there instead, pass CFLAGS explicitly otherwise + they're lost for some reason + - do not use V as variable name, conflicts with one from OpenADK +--- maradns-2.0.09.orig/build/Makefile.linux 2010-08-31 05:56:38.000000000 +0200 ++++ maradns-2.0.09/build/Makefile.linux 2014-06-19 03:16:54.570689574 +0200 +@@ -23,33 +23,33 @@ EXECS=server/maradns # LDFLAGS=-L/usr/ucblib -lucb -lxnet # end the Solaris section # Non-Solaris version of "M" @@ -10,12 +16,11 @@ # Debug --FLAGS = -O2 -Wall -DSELECT_PROBLEM + FLAGS = -O2 -Wall -DSELECT_PROBLEM -M="CC=$(CC) $(FLAGS)" -D="CC=$(CC) $(FLAGS) -DDEBUG -DTHREADS" -+CFLAGS ?= -O2 -Wall -DSELECT_PROBLEM -+M="CC=$(CC)" -+D="CC=$(CC) -DDEBUG -DTHREADS" ++M="CC=$(CC) $(CFLAGS) $(FLAGS)" ++D="CC=$(CC) $(CFLAGS) $(FLAGS) -DDEBUG -DTHREADS" #FLAGS = -g all: @@ -25,8 +30,21 @@ - make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \ + make $(M) $(VER) COMPILED=\"$(COMPILED)\" ; \ cd ../tools ; make $(M) ; \ -- cd ../tcp ; make $(M) $(V) ; cat ../00README.FIRST -+ cd ../tcp ; make $(M) $(VER) +- cd ../deadwood-*/src/ ; make FLAGS=-O2 ; \ +- cd ../../tcp ; make $(M) $(V) ; cat ../00README.FIRST ++ cd ../deadwood-*/src/ ; make FLAGS=-O2 $(M) ; \ ++ cd ../../tcp ; make CFLAGS="$(CFLAGS)" $(VER) ; cat ../00README.FIRST debug: cd libs ; make $(D) DEBUG="-DDEBUG -DTHREADS" ; \ + cd ../dns ; make $(D) ; cd ../rng ; make $(D) ; \ + cd ../parse ; make $(D) ; cd ../qual ; make $(D) ; \ + cd ../server ; \ +- make $(D) $(Q) $(V) COMPILED=\"$(COMPILED_DEBUG)\" ; \ ++ make $(D) $(Q) $(VER) COMPILED=\"$(COMPILED_DEBUG)\" ; \ + cd ../tools ; make $(D) ; \ +- cd ../tcp ; make $(D) $(V) ; cat ../00README.FIRST ++ cd ../tcp ; make $(D) $(VER) ; cat ../00README.FIRST + + clean: + rm -f $(OBJECTS) core $(EXECS) ; \ |