[packages] kismet: drop old atan patch, add new patch to properly link against libm...
authorJo-Philipp Wich <jow@openwrt.org>
Mon, 3 Aug 2009 21:49:31 +0000 (21:49 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Mon, 3 Aug 2009 21:49:31 +0000 (21:49 +0000)
SVN-Revision: 17111

net/kismet/Makefile
net/kismet/patches/100-fix-atan.patch [deleted file]
net/kismet/patches/100-fix-math-lib.patch [new file with mode: 0644]

index f109566..9114eac 100644 (file)
@@ -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 (file)
index d028725..0000000
+++ /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 (file)
index 0000000..3132b17
--- /dev/null
@@ -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@