summaryrefslogtreecommitdiff
path: root/package/olsrd/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-15 18:28:05 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-15 18:28:05 +0100
commitb4a5872460f9ecc6d3ee1d33e6e566e06a452315 (patch)
treeb635d631a00e95520b306e36aea35f33d4721d11 /package/olsrd/patches
parent0975f98bebcefd325c641b202d715522f5710700 (diff)
update to latest, fix musl compile
Diffstat (limited to 'package/olsrd/patches')
-rw-r--r--package/olsrd/patches/patch-Makefile11
-rw-r--r--package/olsrd/patches/patch-make_Makefile_linux23
-rw-r--r--package/olsrd/patches/patch-src_unix_ifnet_c13
3 files changed, 0 insertions, 47 deletions
diff --git a/package/olsrd/patches/patch-Makefile b/package/olsrd/patches/patch-Makefile
deleted file mode 100644
index 1e0318707..000000000
--- a/package/olsrd/patches/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- olsrd-0.6.0.orig/Makefile 2010-05-13 12:52:55.000000000 +0200
-+++ olsrd-0.6.0/Makefile 2010-10-10 14:34:11.000000000 +0200
-@@ -144,7 +144,7 @@ rpm:
-
- # This is quite ugly but at least it works
- ifeq ($(OS),linux)
--SUBDIRS = $(notdir $(shell find lib -maxdepth 2 -name Makefile -not -path lib/Makefile -printf "%h\n"|sort))
-+SUBDIRS = arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo mini nameservice pgraph quagga secure tas txtinfo
- else
- ifeq ($(OS),win32)
- SUBDIRS := dot_draw httpinfo mini pgraph secure txtinfo
diff --git a/package/olsrd/patches/patch-make_Makefile_linux b/package/olsrd/patches/patch-make_Makefile_linux
deleted file mode 100644
index d3ca1cdee..000000000
--- a/package/olsrd/patches/patch-make_Makefile_linux
+++ /dev/null
@@ -1,23 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- olsrd-0.6.0.orig/make/Makefile.linux 2010-03-31 19:03:53.000000000 +0200
-+++ olsrd-0.6.0/make/Makefile.linux 2010-10-10 14:34:11.000000000 +0200
-@@ -4,7 +4,7 @@
-
- ARCH := $(shell uname -m)
- DESTDIR ?=
--LIBDIR = $(DESTDIR)$(shell if [ "$(ARCH)" = "x86_64" -a -d "/usr/lib64" ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)
-+LIBDIR = $(DESTDIR)/usr/lib
-
- SRCS += $(wildcard src/linux/*.c src/unix/*.c)
- HDRS += $(wildcard src/linux/*.h src/unix/*.h)
-@@ -13,8 +13,8 @@ CPPFLAGS += -Dlinux -DLINUX_NETLINK_ROU
- LIBS +=
-
- PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER)
--INSTALL_LIB = install -D -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \
-- /sbin/ldconfig -n $(LIBDIR)
-+INSTALL_LIB = install -d -m 755 $(LIBDIR); \
-+ install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME);
-
- ifdef OLSRD_PLUGIN
- GENERATE_PIC = true
diff --git a/package/olsrd/patches/patch-src_unix_ifnet_c b/package/olsrd/patches/patch-src_unix_ifnet_c
deleted file mode 100644
index 67705012b..000000000
--- a/package/olsrd/patches/patch-src_unix_ifnet_c
+++ /dev/null
@@ -1,13 +0,0 @@
---- olsrd-0.6.0.orig/src/unix/ifnet.c 2010-04-22 17:11:11.000000000 +0200
-+++ olsrd-0.6.0/src/unix/ifnet.c 2010-10-10 14:34:54.000000000 +0200
-@@ -547,10 +547,8 @@ chk_if_up(struct olsr_if *iface, int deb
- struct ifreq ifr;
- union olsr_ip_addr null_addr;
- size_t name_size;
--#ifdef linux
- int precedence = IPTOS_PREC(olsr_cnf->tos);
- int tos_bits = IPTOS_TOS(olsr_cnf->tos);
--#endif
-
- if (iface->host_emul)
- return -1;