From 178a317d2656f8492dbf0f1ed691da0ece79b83f Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Thu, 9 Jun 2005 12:23:36 +0000
Subject: http://bugs.uclibc.org/view.php?id=286 Can't build "bridge" package
 in buildroot (patch enclosed)

---
 package/bridge/Config.in |  1 -
 package/bridge/bridge.mk | 11 ++++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'package/bridge')

diff --git a/package/bridge/Config.in b/package/bridge/Config.in
index d7703a70c..59025f972 100644
--- a/package/bridge/Config.in
+++ b/package/bridge/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_BRIDGE
 	bool "bridge"
 	default n
-	depends BR2_PACKAGE_LINUX
 	help
 	  Manage ethernet bridging; a way to connect networks together to
 	  form a larger network.
diff --git a/package/bridge/bridge.mk b/package/bridge/bridge.mk
index 2a3f9cdd5..d0bc4938b 100644
--- a/package/bridge/bridge.mk
+++ b/package/bridge/bridge.mk
@@ -1,12 +1,13 @@
 #############################################################
 #
-# bridgeutils - User Space Program For Controling Bridging
+# bridgeutils - User Space Program For Controlling Bridging
 #
 #############################################################
 #
+BRIDGE_VERSION=1.0.6
 BRIDGE_SOURCE_URL=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/bridge/
-BRIDGE_SOURCE=bridge-utils-1.0.4.tar.gz
-BRIDGE_BUILD_DIR=$(BUILD_DIR)/bridge-utils-1.0.4
+BRIDGE_SOURCE=bridge-utils-$(BRIDGE_VERSION).tar.gz
+BRIDGE_BUILD_DIR=$(BUILD_DIR)/bridge-utils-$(BRIDGE_VERSION)
 BRIDGE_TARGET_BINARY:=usr/sbin/brctl
 
 $(DL_DIR)/$(BRIDGE_SOURCE):
@@ -36,7 +37,7 @@ $(BRIDGE_BUILD_DIR)/.configured: $(BRIDGE_BUILD_DIR)/.unpacked
 		--mandir=/usr/man \
 		--infodir=/usr/info \
 		$(DISABLE_NLS) \
-		--with-linux-headers=$(LINUX_DIR) \
+		--with-linux-headers=$(LINUX_HEADERS_DIR) \
 	);
 	touch  $(BRIDGE_BUILD_DIR)/.configured
 
@@ -49,7 +50,7 @@ $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY): $(BRIDGE_BUILD_DIR)/brctl/brctl
 	#cp -af $(BRIDGE_BUILD_DIR)/brctl/brctld $(TARGET_DIR)/usr/sbin/
 	#$(STRIP) $(TARGET_DIR)/usr/sbin/brctld
 
-bridge: linux $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY)
+bridge: $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY)
 
 bridge-source: $(DL_DIR)/$(BRIDGE_SOURCE)
 
-- 
cgit v1.2.3