[package] fix dibbler-server pid creation (#6906)

[openwrt/svn-archive/archive.git] / ipv6 / dibbler / Makefile

diff --git a/ipv6/dibbler/Makefile b/ipv6/dibbler/Makefile
index 4878953e34055dd287fd95f9aefc6c0457a0d917..6acf8a4721ba28a3cf0e3a62891ac9ebe7389606 100644 (file)
--- a/ipv6/dibbler/Makefile
+++ b/ipv6/dibbler/Makefile
@@ -1,22 +1,22 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 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:=dibbler
-PKG_VERSION:=0.6.0-RC1
-PKG_RELEASE:=1
+PKG_VERSION:=0.7.3
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tar.gz
-PKG_SOURCE_URL:=@SF/dibbler
-PKG_MD5SUM:=d279efa2b43279f17f6f51cae083d458
+PKG_SOURCE_URL:=http://klub.com.pl/dhcpv6/dibbler/
+PKG_MD5SUM:=39be72da38c2e6d33fd43a2811a276b1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_FIXUP:=libtool
+PKG_LIBTOOL_PATHS:=poslib
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -24,26 +24,58 @@ include $(INCLUDE_DIR)/package.mk
 define Package/dibbler/Default
   SECTION:=ipv6
   CATEGORY:=IPv6
-  DEPENDS:=+uclibcxx @LINUX_2_6
+  DEPENDS:=+libstdcpp @LINUX_2_6 +libpthread
   TITLE:=Dibbler, a portable DHCPv6 implementation
   URL:=http://klub.com.pl/dhcpv6/
 endef
 
+define Package/dibbler/Default/description
+       Dibbler is a portable DHCPv6 implementation. It supports stateful (i.e.
+       IPv6 address granting) as well as stateless (i.e. option granting)
+       autoconfiguration for IPv6.
+endef
+
+define Package/dibbler-poslib
+  $(call Package/dibbler/Default)
+  TITLE+= (helper lib)
+endef
+
+define Package/dibbler-poslib/description
+  $(call Package/dibbler/Default/description)
+  This package contains the pos library.
+endef
+
 define Package/dibbler-client
   $(call Package/dibbler/Default)
   TITLE+= (client)
 endef
 
+define Package/dibbler-client/description
+  $(call Package/dibbler/Default/description)
+  This package contains the dibbler client.
+endef
+
 define Package/dibbler-relay
   $(call Package/dibbler/Default)
   TITLE+= (relay)
 endef
 
+define Package/dibbler-relay/description
+  $(call Package/dibbler/Default/description)
+  This package contains the dibbler relay.
+endef
+
 define Package/dibbler-server
   $(call Package/dibbler/Default)
+  DEPENDS += +dibbler-poslib
   TITLE+= (server)
 endef
 
+define Package/dibbler-server/description
+  $(call Package/dibbler/Default/description)
+  This package contains the dibbler server.
+endef
+
 define Build/Configure
        (cd $(PKG_BUILD_DIR)/poslib; \
                $(TARGET_CONFIGURE_OPTS) \
@@ -74,12 +106,12 @@ define Build/Configure
 endef
 
 # link stuff missing from uClibc++ but present in stdc++ statically
-CXX_LIBS:= -nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm
+CXX_LIBS:= -lstdc++ -lm -lgcc
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
-               PORT_CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -fno-builtin -fno-rtti" \
+               PORT_CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
                PORT_LDFLAGS="$(TARGET_LDFLAGS)" \
                DEBUGINFO= \
                CXXLD="$(TARGET_CC)" \
@@ -88,21 +120,29 @@ define Build/Compile
                server client relay
 endef
 
-define Package/dibbler-client/install  
+define Package/dibbler-poslib/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/./poslib/poslib/.libs/libposlib.so* $(1)/usr/lib/
+endef
+
+define Package/dibbler-client/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/dibbler-client $(1)/usr/sbin/
 endef
 
-define Package/dibbler-relay/install   
+define Package/dibbler-relay/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/dibbler-relay $(1)/usr/sbin/
 endef
 
-define Package/dibbler-server/install  
+define Package/dibbler-server/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/dibbler-server $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/dibbler.init $(1)/etc/init.d/
 endef
 
+$(eval $(call BuildPackage,dibbler-poslib))
 $(eval $(call BuildPackage,dibbler-client))
 $(eval $(call BuildPackage,dibbler-relay))
 $(eval $(call BuildPackage,dibbler-server))