From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 3 Aug 2009 21:49:31 +0000 (+0000)
Subject: [packages] kismet: drop old atan patch, add new patch to properly link against libm... 
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=7179cb25de2e37815b5fae7ee2cb015a242f97f8

[packages] kismet: drop old atan patch, add new patch to properly link against libm, get rid of libnotimpl dependency, use a cleaner override for $(LD) (followup to r17109)


SVN-Revision: 17111
---

diff --git a/net/kismet/Makefile b/net/kismet/Makefile
index f109566719..9114eac371 100644
--- a/net/kismet/Makefile
+++ b/net/kismet/Makefile
@@ -95,12 +95,12 @@ CONFIGURE_VARS += \
 	CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \
 	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++ -I$(LINUX_DIR)/include" \
 	LDFLAGS="$$$$LDFLAGS" \
-	LIBS="-nodefaultlibs -luClibc++ -lm -lgcc -lnotimpl" \
-	CLIENTLIBS="-nodefaultlibs -luClibc++ -lm -lgcc -lnotimpl" \
+	LIBS="-nodefaultlibs -luClibc++ -lm -lgcc" \
+	CLIENTLIBS="-nodefaultlibs -luClibc++ -lm -lgcc" \
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		LD="\$$$$(CC)" \
+		LD="$(TARGET_CXX)" \
 		all
 endef
 
diff --git a/net/kismet/patches/100-fix-atan.patch b/net/kismet/patches/100-fix-atan.patch
deleted file mode 100644
index d0287252e8..0000000000
--- a/net/kismet/patches/100-fix-atan.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gpsd.cc
-+++ b/gpsd.cc
-@@ -478,7 +478,7 @@
- 		if (ty == 0) {
- 			dir = 0.0;
- 		} else {
--			dir = atan(tx / ty);
-+			dir = atan2(tx,ty);
- 		}
- 
- 		if (!finite(dir))
diff --git a/net/kismet/patches/100-fix-math-lib.patch b/net/kismet/patches/100-fix-math-lib.patch
new file mode 100644
index 0000000000..3132b17a5a
--- /dev/null
+++ b/net/kismet/patches/100-fix-math-lib.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -23,7 +23,7 @@
+ CXXLIBS		= @CXXLIBS@
+ KSLIBS		= @KSLIBS@
+ CFLAGS		= @CPPFLAGS@
+-CLIENTLIBS 	= @CLIENTCLIBS@
++CLIENTLIBS 	= @CLIENTCLIBS@ -lm
+ CAPLIBS		= @caplibs@
+ CLIENTFLAGS = @CLIENTCFLAGS@
+ CXXFLAGS 	= -Wall @CXXFLAGS@