diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-01-05 19:30:19 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-01-05 19:30:19 +0000 |
| commit | dc93a938cc61d5f2fc935722bda973a3fff93174 (patch) | |
| tree | 2f387676ca71ddc9bda35361cf23537a025dccf8 /openwrt/package/olsrd/patches | |
| parent | f04609b1fc4d6cfd8416e91a82f9398148c041cb (diff) | |
port olsrd update in [2837] from whiterussian to trunk
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2839 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/package/olsrd/patches')
3 files changed, 12 insertions, 72 deletions
diff --git a/openwrt/package/olsrd/patches/olsrd-0.4.10-opt-flags.diff b/openwrt/package/olsrd/patches/olsrd-0.4.10-opt-flags.diff new file mode 100644 index 000000000..02d1cc813 --- /dev/null +++ b/openwrt/package/olsrd/patches/olsrd-0.4.10-opt-flags.diff @@ -0,0 +1,12 @@ +diff -ruN olsrd-0.4.10-old/Makefile.inc olsrd-0.4.10-new/Makefile.inc +--- olsrd-0.4.10-old/Makefile.inc 2006-01-01 16:58:20.000000000 +0100 ++++ olsrd-0.4.10-new/Makefile.inc 2006-01-05 17:57:23.000000000 +0100 +@@ -21,7 +21,7 @@ + ifndef CFLAGS + CFLAGS += -Wall -Wmissing-prototypes -Wstrict-prototypes \ + -Wmissing-declarations -Wsign-compare +-CFLAGS += -O2 -g ++CFLAGS += $(OFLAGS) + endif + + ifdef OLSRD_PLUGIN diff --git a/openwrt/package/olsrd/patches/olsrd-0.4.9-no-makedepend.patch b/openwrt/package/olsrd/patches/olsrd-0.4.9-no-makedepend.patch deleted file mode 100644 index 1e0e4de1c..000000000 --- a/openwrt/package/olsrd/patches/olsrd-0.4.9-no-makedepend.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -ruN olsrd-0.4.9-old/Makefile olsrd-0.4.9-new/Makefile ---- olsrd-0.4.9-old/Makefile 2005-05-20 17:37:26.000000000 +0200 -+++ olsrd-0.4.9-new/Makefile 2005-05-20 17:42:20.000000000 +0200 -@@ -75,7 +75,7 @@ - OFLAGS ?= -O2 -g - CFLAGS ?= $(CCWARNINGS) $(OFLAGS) #-DDEBUG #-pg #-march=i686 - LIBS = -lm -ldl #-pg --MAKEDEPEND = makedepend -f $(DEPFILE) $(DEFINES) -Y $(INCLUDES) $(SRCS) >/dev/null 2>&1 -+MAKEDEPEND = $(CC) -M $(DEFINES) $(INCLUDES) $(SRCS) >> $(DEPFILE) - - all: cfgparser olsrd - install: install_olsrd -diff -ruN olsrd-0.4.9-old/lib/dot_draw/Makefile olsrd-0.4.9-new/lib/dot_draw/Makefile ---- olsrd-0.4.9-old/lib/dot_draw/Makefile 2005-04-01 23:53:01.000000000 +0200 -+++ olsrd-0.4.9-new/lib/dot_draw/Makefile 2005-05-20 17:42:52.000000000 +0200 -@@ -64,8 +64,7 @@ - - EXTRA_OBJS = # nothing - --MAKEDEPEND = makedepend -f $(DEPFILE) $(CFLAGS_ADD) -Y $(INCLUDES) \ -- $(SRCS) >/dev/null 2>&1 -+MAKEDEPEND = $(CC) -M $(CFLAGS_ADD) $(INCLUDES) $(SRCS) >> $(DEPFILE) - - all: all2 - install: install2 -diff -ruN olsrd-0.4.9-old/lib/nameservice/Makefile olsrd-0.4.9-new/lib/nameservice/Makefile ---- olsrd-0.4.9-old/lib/nameservice/Makefile 2005-03-01 22:41:34.000000000 +0100 -+++ olsrd-0.4.9-new/lib/nameservice/Makefile 2005-05-20 17:42:57.000000000 +0200 -@@ -98,8 +98,7 @@ - - EXTRA_OBJS = # nothing - --MAKEDEPEND = makedepend -f $(DEPFILE) $(CFLAGS_ADD) -Y $(INCLUDES) \ -- $(SRCS) >/dev/null 2>&1 -+MAKEDEPEND = $(CC) -M $(CFLAGS_ADD) $(INCLUDES) $(SRCS) >> $(DEPFILE) - - all: all2 - install: install2 -diff -ruN olsrd-0.4.9-old/src/cfgparser/Makefile olsrd-0.4.9-new/src/cfgparser/Makefile ---- olsrd-0.4.9-old/src/cfgparser/Makefile 2005-03-21 03:17:36.000000000 +0100 -+++ olsrd-0.4.9-new/src/cfgparser/Makefile 2005-05-20 17:43:50.000000000 +0200 -@@ -56,7 +56,7 @@ - - ifeq ($(OS), linux) - PIPETONULL = >/dev/null 2>&1 --DEPFLAGS += -Dlinux -Y -+DEPFLAGS += -Dlinux - endif - - ifeq ($(OS), fbsd) -@@ -129,7 +129,7 @@ - endif - endif - --MAKEDEPEND = makedepend -f $(DEPFILE) $(DEPFLAGS) $(INCLUDES) $(SRCS) $(PIPETONULL) -+MAKEDEPEND = $(CC) -M $(DEPFLAGS) $(INCLUDES) $(SRCS) >> $(DEPFILE) - - OBJS = olsrd_conf.o oparse.o oscan.o cfgfile_gen.o $(PORT_OBJS) - LIBS += $(PORT_LIBS) diff --git a/openwrt/package/olsrd/patches/olsrd-0.4.9-opt-flags.diff b/openwrt/package/olsrd/patches/olsrd-0.4.9-opt-flags.diff deleted file mode 100644 index c601ae015..000000000 --- a/openwrt/package/olsrd/patches/olsrd-0.4.9-opt-flags.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruN olsrd-0.4.9-orig/Makefile olsrd-0.4.9-1/Makefile ---- olsrd-0.4.9-orig/Makefile 2005-03-31 20:39:24.000000000 +0200 -+++ olsrd-0.4.9-1/Makefile 2005-04-05 02:14:48.000000000 +0200 -@@ -72,7 +72,8 @@ - SRCS += $(wildcard src/linux/*.c) $(wildcard src/unix/*.c) - HDRS += $(wildcard src/linux/*.h) $(wildcard src/unix/*.h) - DEFINES = -Dlinux --CFLAGS ?= $(CCWARNINGS) -O2 -g #-DDEBUG #-pg #-march=i686 -+OFLAGS ?= -O2 -g -+CFLAGS ?= $(CCWARNINGS) $(OFLAGS) #-DDEBUG #-pg #-march=i686 - LIBS = -lm -ldl #-pg - MAKEDEPEND = makedepend -f $(DEPFILE) $(DEFINES) -Y $(INCLUDES) $(SRCS) >/dev/null 2>&1 - |