wing: Enable parallel build

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

diff --git a/ipv6/dibbler/Makefile b/ipv6/dibbler/Makefile
index 08ed75fd7f7b7cd7d944a3553382b93b01a4954f..419f8ef5c6d0686c5942890d29d9a7a0bf6737cf 100644 (file)
--- a/ipv6/dibbler/Makefile
+++ b/ipv6/dibbler/Makefile
@@ -1,20 +1,22 @@
 #
-# Copyright (C) 2006-2008 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.7.1
-PKG_RELEASE:=1
+PKG_VERSION:=0.7.3
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tar.gz
-PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_MD5SUM:=76a814d528274b2dc7ff7623bd6f6b45
+PKG_SOURCE_URL:=http://klub.com.pl/dhcpv6/dibbler/
+PKG_MD5SUM:=39be72da38c2e6d33fd43a2811a276b1
+
+PKG_FIXUP:=libtool
+PKG_LIBTOOL_PATHS:=poslib
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -22,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/dibbler/Default
   SECTION:=ipv6
   CATEGORY:=IPv6
-  DEPENDS:=+uclibcxx @LINUX_2_6
+  DEPENDS:=+libstdcpp @!LINUX_2_4 +libpthread
   TITLE:=Dibbler, a portable DHCPv6 implementation
   URL:=http://klub.com.pl/dhcpv6/
 endef
@@ -33,6 +35,16 @@ define Package/dibbler/Default/description
        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)
@@ -55,6 +67,7 @@ endef
 
 define Package/dibbler-server
   $(call Package/dibbler/Default)
+  DEPENDS += +dibbler-poslib
   TITLE+= (server)
 endef
 
@@ -92,21 +105,20 @@ define Build/Configure
        );
 endef
 
-# link stuff missing from uClibc++ but present in stdc++ statically
-CXX_LIBS:= -nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm
-
 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)" \
-               CLNT_LIBS="$(CXX_LIBS)" \
-               SRV_LIBS="$(CXX_LIBS)" \
                server client relay
 endef
 
+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/
@@ -120,8 +132,11 @@ endef
 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))