aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/maradns
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2010-03-17 13:37:41 +0800
committerHolger Hans Peter Freyther <zecke@selfish.org>2010-03-17 14:02:11 +0800
commitd4574145085218e93f55724924e3e99c39ea3afd (patch)
tree9d353ddb41371a6da42f6b1e0f8eaf71b09bda44 /recipes/maradns
parentb6faa2ebb00fa219beee042aeb41321b0d4fbc18 (diff)
downloadopenembedded-d4574145085218e93f55724924e3e99c39ea3afd.tar.gz
maradns: Upgrade to version 1.4.03
* Patch the Makefiles so LDFLAGS is passed to the linker
Diffstat (limited to 'recipes/maradns')
-rw-r--r--recipes/maradns/files/compile-1.4.0.3.patch61
-rw-r--r--recipes/maradns/maradns_1.4.03.bb (renamed from recipes/maradns/maradns_1.0.41.bb)7
2 files changed, 66 insertions, 2 deletions
diff --git a/recipes/maradns/files/compile-1.4.0.3.patch b/recipes/maradns/files/compile-1.4.0.3.patch
new file mode 100644
index 0000000000..ad7d1f8617
--- /dev/null
+++ b/recipes/maradns/files/compile-1.4.0.3.patch
@@ -0,0 +1,61 @@
+Index: maradns-1.4.03/server/Makefile.recursive
+===================================================================
+--- maradns-1.4.03.orig/server/Makefile.recursive 2010-03-17 13:04:16.831313185 +0800
++++ maradns-1.4.03/server/Makefile.recursive 2010-03-17 13:04:31.304869993 +0800
+@@ -52,8 +52,8 @@
+ $(CC) -c $(FLAGS) -o udpsuccess.o udpsuccess.c
+
+ maradns: MaraDNS.c $(OBJECTS) MaraDNS_locale.h
+- $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
++ $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread $(LDFLAGS)
+
+ simple: simple.c $(XOBJECTS) MaraDNS_locale.h
+- $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o simple $(OBJECTS) simple.c
++ $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o simple $(OBJECTS) simple.c $(LDFLAGS)
+
+Index: maradns-1.4.03/tcp/Makefile.recursive
+===================================================================
+--- maradns-1.4.03.orig/tcp/Makefile.recursive 2010-03-17 13:20:21.270078031 +0800
++++ maradns-1.4.03/tcp/Makefile.recursive 2010-03-17 13:20:37.020069979 +0800
+@@ -26,11 +26,11 @@
+ rm -f core $(EXECS) $(TCPOBJS) *.exe
+
+ getzone: getzone.c $(OBJECTS)
+- $(CC) $(FLAGS) -o getzone getzone.c $(OBJECTS)
++ $(CC) $(FLAGS) -o getzone getzone.c $(OBJECTS) $(LDFLAGS)
+
+ fetchzone: fetchzone.c $(OBJECTS)
+- $(CC) $(FLAGS) -o fetchzone fetchzone.c $(OBJECTS)
++ $(CC) $(FLAGS) -o fetchzone fetchzone.c $(OBJECTS) $(LDFLAGS)
+
+ zoneserver: zoneserver.c zoneserver_en.h $(OBJECTS)
+- $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -o zoneserver zoneserver.c $(OBJECTS) $(RNGOBJS)
++ $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -o zoneserver zoneserver.c $(OBJECTS) $(RNGOBJS) $(LDFLAGS)
+
+Index: maradns-1.4.03/tools/Makefile.recursive
+===================================================================
+--- maradns-1.4.03.orig/tools/Makefile.recursive 2010-03-17 13:05:46.600079208 +0800
++++ maradns-1.4.03/tools/Makefile.recursive 2010-03-17 13:10:39.090763025 +0800
+@@ -18,17 +18,17 @@
+ rm -f core $(EXECS) *.exe
+
+ askmara: askmara.c askmara_labels_en.h $(OBJECTS) $(Q) $(OUTOBJ)
+- $(CC) $(FLAGS) -o askmara askmara.c $(OBJECTS) $(Q) $(OUTOBJ)
++ $(CC) $(FLAGS) -o askmara askmara.c $(OBJECTS) $(Q) $(OUTOBJ) $(LDFLAGS)
+
+ askmara-tcp: askmara-tcp.c askmara_labels_en.h $(OBJECTS) $(ROBJECTS) $(POBJECTS)
+- $(CC) $(FLAGS) -o askmara-tcp askmara-tcp.c $(OBJECTS) $(ROBJECTS) $(POBJECTS)
++ $(CC) $(FLAGS) -o askmara-tcp askmara-tcp.c $(OBJECTS) $(ROBJECTS) $(POBJECTS) $(LDFLAGS)
+
+ benchmark: benchmark.c askmara_labels_en.h $(OBJECTS) $(POBJECTS)
+- $(CC) $(FLAGS) -o benchmark benchmark.c $(OBJECTS) $(POBJECTS)
++ $(CC) $(FLAGS) -o benchmark benchmark.c $(OBJECTS) $(POBJECTS) $(LDFLAGS)
+
+ duende: duende.c
+- $(CC) $(FLAGS) -o duende duende.c
++ $(CC) $(FLAGS) -o duende duende.c $(LDFLAGS)
+
+ strip.control: strip.control.c
+- $(CC) $(FLAGS) -o strip.control strip.control.c
++ $(CC) $(FLAGS) -o strip.control strip.control.c $(LDFLAGS)
+
diff --git a/recipes/maradns/maradns_1.0.41.bb b/recipes/maradns/maradns_1.4.03.bb
index a8bed6f05e..4d547a2788 100644
--- a/recipes/maradns/maradns_1.0.41.bb
+++ b/recipes/maradns/maradns_1.4.03.bb
@@ -3,9 +3,12 @@ SECTION = "console/network"
HOMEPAGE = "http://www.maradns.org"
LICENSE = "PD"
-SRC_URI = "http://www.maradns.org/download/1.0/maradns-${PV}.tar.bz2 \
+SRC_URI = "http://www.maradns.org/download/1.4/${PV}/maradns-${PV}.tar.bz2;name=src \
file://init \
- file://rng-makefile-build-cc.patch;patch=1;pnum=0"
+ file://rng-makefile-build-cc.patch;patch=1;pnum=0 \
+ file://compile-1.4.0.3.patch;patch=1 "
+SRC_URI[src.md5sum] = "071b3a3df07e18855a7edf9a6281641a"
+SRC_URI[src.sha256sum] = "a611b6ac0f3abee62c227b128c1773be4a2a41de75a37ca123d684db33793b23"
do_install() {
install -d ${D}${bindir}