bridge-utils: Fix compiling package.

This commit is contained in:
Michael Tremer
2013-08-28 09:43:44 +02:00
parent bb5f0bf8f3
commit c0b99a4ced
3 changed files with 34 additions and 1 deletions

View File

@@ -70,6 +70,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bridge-utils-1.5-compile-fix-1.patch
cd $(DIR_APP) && find . -name Makefile.in | xargs sed -i -e "s/^KERNEL_HEADERS/#&/g"
cd $(DIR_APP) && autoreconf -vfi
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)

View File

@@ -600,7 +600,7 @@ buildipfire() {
ipfiremake sudo
ipfiremake mc
ipfiremake wget
# ipfiremake bridge-utils
ipfiremake bridge-utils
ipfiremake screen
ipfiremake smartmontools
ipfiremake htop

View File

@@ -0,0 +1,31 @@
From 5eebb7f9288b7881ffb929b1fd494fe3ac3be27d Mon Sep 17 00:00:00 2001
From: Russell Senior <russell@personaltelco.net>
Date: Wed, 06 Mar 2013 20:49:42 +0000
Subject: bridge-utils: Fix compile against linux-3.8.x
Linux 3.8 has a header, include/uapi/linux/if_bridge.h that uses a
struct in6_addr but doesn't define it. The trivial seeming fix of
including the header that does define it causes more problems. The
problem was discussed on mailing lists in January 2013. The final
suggestion I found was here:
http://www.redhat.com/archives/libvir-list/2013-January/msg01253.html
This is intended to implement that suggestion.
Signed-off-by: Russell Senior <russell@personaltelco.net>
---
diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h
index 39964f2..dd14bae 100644
--- a/libbridge/libbridge.h
+++ b/libbridge/libbridge.h
@@ -20,6 +20,7 @@
#define _LIBBRIDGE_H
#include <sys/socket.h>
+#include <netinet/in.h>
#include <linux/if.h>
#include <linux/if_bridge.h>
--
cgit v0.9.2