From 7dc7c9ba8b8099054f267009367b99766d8b77ad Mon Sep 17 00:00:00 2001 From: Jens Muecke Date: Fri, 3 Aug 2007 03:08:18 +0000 Subject: [PATCH] fix segfault and set right dependency git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/olsrd@8326 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- Makefile | 4 ++-- patches/110-cflags.patch | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 patches/110-cflags.patch diff --git a/Makefile b/Makefile index a64bfff..3c7581b 100644 --- a/Makefile +++ b/Makefile @@ -43,14 +43,14 @@ endef define Package/olsrd-mod-bmf $(call Package/olsrd) - DEPENDS:=olsrd libpthread kmod-tun + DEPENDS:=olsrd +libpthread +kmod-tun TITLE:=Basic multicast forwarding plugin MENU:=0 endef define Package/olsrd-mod-dyn-gw $(call Package/olsrd) - DEPENDS:=olsrd + DEPENDS:=olsrd +libpthread TITLE:=Dynamic internet gateway plugin MENU:=0 endef diff --git a/patches/110-cflags.patch b/patches/110-cflags.patch new file mode 100644 index 0000000..b403f67 --- /dev/null +++ b/patches/110-cflags.patch @@ -0,0 +1,22 @@ +Index: olsrd-0.5.2/Makefile.inc +=================================================================== +--- olsrd-0.5.2.orig/Makefile.inc 2007-08-03 04:25:53.320043315 +0200 ++++ olsrd-0.5.2/Makefile.inc 2007-08-03 04:25:57.816299546 +0200 +@@ -62,7 +62,7 @@ LDFLAGS += -Wl,-export-dynamic + endif + + # options to save space on small systems +-DEFINES += -DSUPPORT_OLD_PLUGIN_VERSIONS=1 ++CFLAGS += -DSUPPORT_OLD_PLUGIN_VERSIONS=1 + + # search sources and headers in current dir and in src/ + SRCS = $(wildcard src/*.c) +@@ -102,7 +102,7 @@ endif + CFLAGS += -MD + + # we always need the includes and defines +-CFLAGS += $(INCLUDES) $(DEFINES) ++CFLAGS += $(INCLUDES) + + TAGFILE ?= src/TAGS + -- 2.35.1