From: Nicolas Thill <nico@openwrt.org>
Date: Tue, 31 Oct 2006 17:37:18 +0000 (+0000)
Subject: resync gpsd with old trunk version
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0759714f972d85f7437077980838be082c7f0754;p=openwrt%2Fsvn-archive%2Farchive.git

resync gpsd with old trunk version


SVN-Revision: 5363
---

diff --git a/net/gpsd/Makefile b/net/gpsd/Makefile
index 888236f719..15f5281e2d 100644
--- a/net/gpsd/Makefile
+++ b/net/gpsd/Makefile
@@ -1,88 +1,71 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gpsd
 PKG_VERSION:=2.30
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://download.berlios.de/gpsd/
 PKG_MD5SUM:=dde177174878e8ae6db15f8010da46dd
 PKG_CAT:=zcat
 
-PKG_BUILDDEP=libpthread uclibcxx ncurses
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+PKG_BUILDDEP=libncurses libnotimpl
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/gpsd
   SECTION:=net
   CATEGORY:=Network
-  TITLE:=gpsd
-  DEPENDS:=+libpthread +uclibcxx +libncurses
-  DESCRIPTION:=An interface daemon for GPS receivers
+  DEPENDS:=+libpthread +uclibcxx
+  TITLE:=An interface daemon for GPS receivers
 endef
 
 define Build/Configure
-	( cd $(PKG_BUILD_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++"  \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-nodefaultlibs -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-		LIBS="-luClibc++ -lc -lm -lnotimpl" \
-		./configure \
-		        --target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_LARGEFILE) \
-			$(DISABLE_NLS) \
-			--enable-shared \
-			--enable-static \
-			--with-gnu-ld \
-			--without-x \
-        );
+	$(call Build/Configure/Default, \
+		--without-x \
+		, \
+		CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \
+		LIBS="-nodefaultlibs -luClibc++ -lnotimpl -lm -lc" \
+        )
 endef
 
 define Build/Compile
-	$(CP) $(PKG_BUILD_DIR)/libtool $(PKG_BUILD_DIR)/libtool.orig
-	sed 's/-lstdc++ //' $(PKG_BUILD_DIR)/libtool.orig > $(PKG_BUILD_DIR)/libtool
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		all
-endef
-
-define Package/gpsd/install
-	install -d -m0755 $(1)/usr/lib
-	install -m0755 $(PKG_BUILD_DIR)/.libs/libgps.so* $(1)/usr/lib/
-	install -d -m0755 $(1)/usr/sbin/
-	install -m0755 $(PKG_BUILD_DIR)/.libs/gpsd $(1)/usr/sbin/
+		CXXLINK="\$$$$(LINK)" \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
 endef
 
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/gps{,d}.h $(STAGING_DIR)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libgpsmm.h $(STAGING_DIR)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/gps{,d}.h $(STAGING_DIR)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/libgpsmm.h $(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/.libs/libgps.{a,so*} $(STAGING_DIR)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgps.{a,so*} $(STAGING_DIR)/usr/lib/
 endef
 
 define Build/UninstallDev
-	rm -rf $(STAGING_DIR)/usr/include/gps{,d}.h \
+	rm -rf	$(STAGING_DIR)/usr/include/gps{,d}.h \
 		$(STAGING_DIR)/usr/include/libgpsmm.h \
 		$(STAGING_DIR)/usr/lib/libgps.{a,so*} 
 endef
 
+define Package/gpsd/install
+	install -d -m0755 $(1)/usr/lib
+	install -m0755 $(PKG_INSTALL_DIR)/usr/lib/libgps.so.* $(1)/usr/lib/
+	install -d -m0755 $(1)/usr/sbin
+	install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/gpsd $(1)/usr/sbin/
+endef
+
 $(eval $(call BuildPackage,gpsd))