Changeset 12000


Ignore:
Timestamp:
2008-07-30T01:55:44+02:00 (10 years ago)
Author:
nico
Message:

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
File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/net/gpsd/Makefile

    r11709 r12000  
    1111PKG_NAME:=gpsd 
    1212PKG_VERSION:=2.37 
    13 PKG_RELEASE:=1 
     13PKG_RELEASE:=2 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     
    1919PKG_FIXUP = libtool 
    2020 
    21 PKG_BUILD_DEPENDS=libncurses libnotimpl 
     21PKG_BUILD_DEPENDS=libncurses 
    2222 
    2323include $(INCLUDE_DIR)/package.mk 
     
    2626  SECTION:=net 
    2727  CATEGORY:=Network 
    28   DEPENDS:=+libpthread +uclibcxx 
     28  DEPENDS:=+libpthread +libstdcpp 
    2929  TITLE:=An interface daemon for GPS receivers 
    3030  URL:=http://gpsd.berlios.de/ 
     
    3232 
    3333CONFIGURE_ARGS += \ 
     34        --disable-dbus \ 
    3435        --disable-python \ 
    3536        --disable-sirf \ 
     
    5051        --without-x \ 
    5152 
    52 CONFIGURE_VARS += \ 
    53         CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \ 
    54         CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \ 
    55         LIBS="-nodefaultlibs -luClibc++ -lnotimpl" \ 
    56  
    57 define Build/Configure 
    58         (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \ 
    59                 ./autogen.sh \ 
    60         ); 
    61         $(call Build/Configure/Default) 
     53define Build/Compile 
     54        $(MAKE) -C $(PKG_BUILD_DIR) \ 
     55                DESTDIR="$(PKG_INSTALL_DIR)" \ 
     56                all install 
    6257endef 
    6358 
    6459define Build/InstallDev 
    65         mkdir -p $(1)/usr/include 
    66         $(CP) $(PKG_BUILD_DIR)/gps{,d}.h $(1)/usr/include/ 
    67         $(CP) $(PKG_BUILD_DIR)/libgpsmm.h $(1)/usr/include/ 
    68         mkdir -p $(1)/usr/lib 
    69         $(CP) $(PKG_BUILD_DIR)/.libs/libgps.{a,so*} $(1)/usr/lib/ 
     60        $(INSTALL_DIR) $(1)/usr/include 
     61        $(CP) $(PKG_INSTALL_DIR)/usr/include/gps.h $(1)/usr/include/ 
     62        $(INSTALL_DIR) $(1)/usr/lib 
     63        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgps.{a,so*} $(1)/usr/lib/ 
    7064endef 
    7165 
    7266define Package/gpsd/install 
    7367        $(INSTALL_DIR) $(1)/usr/lib 
    74         $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/libgps.so.* $(1)/usr/lib/ 
     68        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libgps.so.* $(1)/usr/lib/ 
    7569        $(INSTALL_DIR) $(1)/usr/sbin 
    76         $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/gpsd $(1)/usr/sbin/ 
     70        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/gpsd $(1)/usr/sbin/ 
    7771endef 
    7872 
Note: See TracChangeset for help on using the changeset viewer.