From c36478798eddefb955ee6842716d37acc5ae2f5d Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 2 Oct 2005 15:10:10 +0000
Subject: [PATCH] backport fix from head, bump release number

SVN-Revision: 2021
---
 openwrt/package/net-snmp/Makefile | 8 ++++----
 openwrt/package/nmap/Makefile     | 9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/openwrt/package/net-snmp/Makefile b/openwrt/package/net-snmp/Makefile
index 166d9d3b0a..95e01f6610 100644
--- a/openwrt/package/net-snmp/Makefile
+++ b/openwrt/package/net-snmp/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=net-snmp
 PKG_VERSION:=5.1.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MD5SUM:=8080555ab3f90011f25d5122042d9a8d
 
 PKG_SOURCE_URL:=@SF/net-snmp
@@ -23,7 +23,6 @@ SNMP_MIB_MODULES_INCLUDED = \
 	host/hr_proc \
 	host/hr_storage \
 	host/hr_system \
-	ieee802dot11 \
 	mibII/at \
 	mibII/icmp \
 	mibII/interfaces \
@@ -55,6 +54,7 @@ SNMP_MIB_MODULES_EXCLUDED = \
 	agent_mibs \
 	agentx \
 	host \
+	ieee802dot11 \
 	mibII \
 	notification \
 	snmpv3mibs \
@@ -102,8 +102,8 @@ $(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
 		ac_cv_header_pcap_h=no \
 		./configure \
 		  --target=$(GNU_TARGET_NAME) \
diff --git a/openwrt/package/nmap/Makefile b/openwrt/package/nmap/Makefile
index 3c28caa399..2cded7e626 100644
--- a/openwrt/package/nmap/Makefile
+++ b/openwrt/package/nmap/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nmap
 PKG_VERSION:=3.81
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MD5SUM:=0713306dda85aee2c95ef31b4b7d2838
 
 PKG_SOURCE_URL:=http://download.insecure.org/nmap/dist
@@ -23,9 +23,10 @@ $(PKG_BUILD_DIR)/.configured:
 		$(TARGET_CONFIGURE_OPTS) \
 		libpcapdir="$(STAGING_DIR)/usr/lib" \
 		CFLAGS="$(TARGET_CFLAGS)" \
-		CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -nostdinc++ -nodefaultlibs " \
+		CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -nostdinc++" \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib  -fno-builtin -nostdinc++ -nodefaultlibs -luClibc++ -lc -lm -lgcc_s" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		LIBS="-nodefaultlibs -luClibc++ -lc -lm" \
 		ac_cv_prog_CXX="$(TARGET_CXX)" \
 		./configure \
 		  --target=$(GNU_TARGET_NAME) \
@@ -58,7 +59,7 @@ $(PKG_BUILD_DIR)/.built:
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		CCOPT="-fno-builtin -nostdinc++ -nodefaultlibs $(TARGET_CFLAGS)" \
+		CCOPT="$(TARGET_CFLAGS) -fno-builtin -nostdinc++" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 	touch $@
-- 
2.30.2