lede-packages-rs

commit 14ee468dae9ef3c4ea1265cf5cd9047b475d50cc
parent 3956aaf7412d72915e012b8ae7a2a7f726956d4c
Author: sbyx <steven@midlink.org>
Date:   Fri, 22 Aug 2014 16:34:55 +0200

Merge pull request #234 from ejonny/fix-dtn-packages

Fix recipes for packages related to Delay- and Disruption-Tolerant Networking
Diffstat:
M
libs/dtndht/Makefile
 | 
3
+--
M
libs/ibrcommon/Makefile
 | 
3
+--
M
libs/ibrdtn/Makefile
 | 
3
+--
M
libs/libarchive/Makefile
 | 
5
++---
M
net/ibrdtn-tools/Makefile
 | 
1
-
M
net/ibrdtnd/Makefile
 | 
1
-

6 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/libs/dtndht/Makefile b/libs/dtndht/Makefile
@@ -19,7 +19,6 @@ PKG_LICENSE:=Apache-2.0
 
 PKG_INSTALL:=1
 PKG_FIXUP:=libtool
-PKG_BUILD_DEPENDS:=libopenssl
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -41,7 +40,7 @@ endef
 
 define Package/dtndht/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME){.so,-$(PKG_VERSION_MAJOR).$(PKG_VERSION_MINOR).so.*} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,dtndht))
diff --git a/libs/ibrcommon/Makefile b/libs/ibrcommon/Makefile
@@ -19,7 +19,6 @@ PKG_LICENSE:=Apache-2.0
 
 PKG_INSTALL:=1
 PKG_FIXUP:=libtool
-PKG_BUILD_DEPENDS:=libnl libopenssl
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -44,7 +43,7 @@ endef
 
 define Package/ibrcommon/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME){.so,-$(PKG_VERSION_MAJOR).$(PKG_VERSION_MINOR).so.*} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,ibrcommon))
diff --git a/libs/ibrdtn/Makefile b/libs/ibrdtn/Makefile
@@ -19,7 +19,6 @@ PKG_LICENSE:=Apache-2.0
 
 PKG_INSTALL:=1
 PKG_FIXUP:=libtool
-PKG_BUILD_DEPENDS:=ibrcommon zlib
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -44,7 +43,7 @@ endef
 
 define Package/ibrdtn/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME){.so,-$(PKG_VERSION_MAJOR).$(PKG_VERSION_MINOR).so.*} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,ibrdtn))
diff --git a/libs/libarchive/Makefile b/libs/libarchive/Makefile
@@ -19,7 +19,6 @@ PKG_LICENSE:=BSD-2-Clause
 
 PKG_INSTALL:=1
 PKG_FIXUP:=autoreconf
-PKG_BUILD_DEPENDS:=libxml2 libopenssl zlib
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -31,7 +30,7 @@ endef
 
 define Package/libarchive
   $(call Package/libarchive/Default)
-  DEPENDS:=+libxml2 +libopenssl +zlib
+  DEPENDS:=+libxml2 +libopenssl +zlib +libacl +libattr +libbz2 +liblzo +libnettle
   TITLE:=Multi-format archive and compression library
 endef
 
@@ -46,7 +45,7 @@ endef
 
 define Package/libarchive/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libarchive.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libarchive))
diff --git a/net/ibrdtn-tools/Makefile b/net/ibrdtn-tools/Makefile
@@ -18,7 +18,6 @@ PKG_MAINTAINER:=Johannes Morgenroth <morgenroth@ibr.cs.tu-bs.de>
 PKG_LICENSE:=Apache-2.0
 
 PKG_INSTALL:=1
-PKG_BUILD_DEPENDS:=libarchive ibrdtn
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/ibrdtnd/Makefile b/net/ibrdtnd/Makefile
@@ -18,7 +18,6 @@ PKG_MAINTAINER:=Johannes Morgenroth <morgenroth@ibr.cs.tu-bs.de>
 PKG_LICENSE:=Apache-2.0
 
 PKG_INSTALL:=1
-PKG_BUILD_DEPENDS:=dtndht ibrdtn libsqlite3
 
 include $(INCLUDE_DIR)/package.mk