From b9d4d6f85f5fafcc40a3be77f10d5bc06979fc70 Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 29 Jul 2008 23:55:44 +0000
Subject: [PATCH] gpsd fixes:  - linking against uClibc++ alone doesn't work
 (because of libtool), so use libstdc++ instead (closes: #3139)  - uClibc now
 has the necessary math functions, don't use libnotimpl anymore  - explicitly
 disable dbus  - use PKG_INSTALL_DIR and make install

git-svn-id: svn://svn.openwrt.org/openwrt/packages@12000 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 net/gpsd/Makefile | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/net/gpsd/Makefile b/net/gpsd/Makefile
index 467479ae2..29f396bc8 100644
--- a/net/gpsd/Makefile
+++ b/net/gpsd/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gpsd
 PKG_VERSION:=2.37
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://download.berlios.de/gpsd/
@@ -18,19 +18,20 @@ PKG_MD5SUM:=6c96cc0b2df0279cb7baac1ebc5881d3
 
 PKG_FIXUP = libtool
 
-PKG_BUILD_DEPENDS=libncurses libnotimpl
+PKG_BUILD_DEPENDS=libncurses
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/gpsd
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libpthread +uclibcxx
+  DEPENDS:=+libpthread +libstdcpp
   TITLE:=An interface daemon for GPS receivers
   URL:=http://gpsd.berlios.de/
 endef
 
 CONFIGURE_ARGS += \
+	--disable-dbus \
 	--disable-python \
 	--disable-sirf \
 	--disable-tsip \
@@ -49,31 +50,24 @@ CONFIGURE_ARGS += \
 	--disable-reconfigure \
 	--without-x \
 
-CONFIGURE_VARS += \
-	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \
-	CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \
-	LIBS="-nodefaultlibs -luClibc++ -lnotimpl" \
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
-		./autogen.sh \
-	);
-	$(call Build/Configure/Default)
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
 endef
 
 define Build/InstallDev
-	mkdir -p $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/gps{,d}.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libgpsmm.h $(1)/usr/include/
-	mkdir -p $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/.libs/libgps.{a,so*} $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/gps.h $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgps.{a,so*} $(1)/usr/lib/
 endef
 
 define Package/gpsd/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/libgps.so.* $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libgps.so.* $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/gpsd $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/gpsd $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,gpsd))